admin/ddei-editor
1
0
Fork 0
mirror of https://gitee.com/hoslay/ddei-editor.git synced 2025-12-07 17:48:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

将CREATE_BEFORE的传入参数统一为model而非modelDefine

Browse Source
This commit is contained in:
猴赛雷 2024-11-13 14:37:14 +08:00
parent 949389538a
commit 9ace402379
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ddei-editor", "name": "ddei-editor",
"version": "1.2.43-4", "version": "1.2.43-6",
"private": false, "private": false,
"type": "module", "type": "module",
"author": "hoslay <3697355039@qq.com>", "author": "hoslay <3697355039@qq.com>",

31
plugins/core/panels/simple/ToolboxSimple.vue
View File

@ -238,7 +238,6 @@ export default {
*/ */
createControlPrepare(group, e) { createControlPrepare(group, e) {
let control = group.currentControl ? group.currentControl : group.controls?.length > 0 ? group.controls[0] : null let control = group.currentControl ? group.currentControl : group.controls?.length > 0 ? group.controls[0] : null
let editMode = group.editMode let editMode = group.editMode
//获取当前实例 //获取当前实例
@ -458,23 +457,23 @@ export default {
if ((layer.display == 0 && !layer.tempDisplay) || layer.lock) { if ((layer.display == 0 && !layer.tempDisplay) || layer.lock) {
return; return;
} }
let rsState = DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_BEFORE", DDeiEnumOperateType.CREATE, { models: [control] }, ddInstance, e) let controlInitJSON = DDeiEditorUtil.getModelInitJSON(this.editor.ddInstance, null, [{ model: control.id }])
if (rsState == 0 || rsState == 1) {
let controlInitJSON = DDeiEditorUtil.getModelInitJSON(this.editor.ddInstance, null, [{ model: control.id }])
if (controlInitJSON){ if (controlInitJSON){
let models = this.editor.addControls(controlInitJSON) let models = this.editor.addControls(controlInitJSON)
let pushDatas = [] let rsState = DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_BEFORE", DDeiEnumOperateType.CREATE, { models: models }, ddInstance, e)
models.forEach((model, key) => { if (rsState == 0 || rsState == 1) {
pushDatas.push({ id: model.id, value: DDeiEnumControlState.SELECTED }); let pushDatas = []
}); models.forEach((model, key) => {
this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.CancelCurLevelSelectedModels, null, e); pushDatas.push({ id: model.id, value: DDeiEnumControlState.SELECTED });
this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.ModelChangeSelect, pushDatas, e); });
this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.StageChangeSelectModels); this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.CancelCurLevelSelectedModels, null, e);
this.editor.bus.executeAll() this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.ModelChangeSelect, pushDatas, e);
this.editor.changeState(DDeiEditorState.DESIGNING); this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.StageChangeSelectModels);
DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_AFTER", DDeiEnumOperateType.CREATE, { models: models }, ddInstance, e) this.editor.bus.executeAll()
} this.editor.changeState(DDeiEditorState.DESIGNING);
DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_AFTER", DDeiEnumOperateType.CREATE, { models: models }, ddInstance, e)
}
} }
} }
} }

2
src/App.vue
View File

@ -21,7 +21,7 @@ export default defineComponent({
data() { data() {
const options = markRaw({ const options = markRaw({
// currentLayout: "ddei-core-layout-simple", currentLayout: "ddei-core-layout-simple",
config: { config: {
ratio: 1.2, //默认缩放比例为120% ratio: 1.2, //默认缩放比例为120%
pixel:2, //调整渲染质量 pixel:2, //调整渲染质量