From 9ace402379b54895783ad5f6eb1118d8feb5c505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=B4=E8=B5=9B=E9=9B=B7?= Date: Wed, 13 Nov 2024 14:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86CREATE=5FBEFORE=E7=9A=84=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0=E7=BB=9F=E4=B8=80=E4=B8=BAmodel?= =?UTF-8?q?=E8=80=8C=E9=9D=9EmodelDefine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- plugins/core/panels/simple/ToolboxSimple.vue | 31 ++++++++++---------- src/App.vue | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 0e14643..1de66e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.43-4", + "version": "1.2.43-6", "private": false, "type": "module", "author": "hoslay <3697355039@qq.com>", diff --git a/plugins/core/panels/simple/ToolboxSimple.vue b/plugins/core/panels/simple/ToolboxSimple.vue index 8e4d665..52a762e 100644 --- a/plugins/core/panels/simple/ToolboxSimple.vue +++ b/plugins/core/panels/simple/ToolboxSimple.vue @@ -238,7 +238,6 @@ export default { */ createControlPrepare(group, e) { let control = group.currentControl ? group.currentControl : group.controls?.length > 0 ? group.controls[0] : null - let editMode = group.editMode //获取当前实例 @@ -458,23 +457,23 @@ export default { if ((layer.display == 0 && !layer.tempDisplay) || layer.lock) { return; } - let rsState = DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_BEFORE", DDeiEnumOperateType.CREATE, { models: [control] }, ddInstance, e) - if (rsState == 0 || rsState == 1) { - let controlInitJSON = DDeiEditorUtil.getModelInitJSON(this.editor.ddInstance, null, [{ model: control.id }]) + let controlInitJSON = DDeiEditorUtil.getModelInitJSON(this.editor.ddInstance, null, [{ model: control.id }]) if (controlInitJSON){ let models = this.editor.addControls(controlInitJSON) - let pushDatas = [] - models.forEach((model, key) => { - pushDatas.push({ id: model.id, value: DDeiEnumControlState.SELECTED }); - }); - this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.CancelCurLevelSelectedModels, null, e); - this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.ModelChangeSelect, pushDatas, e); - this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.StageChangeSelectModels); - this.editor.bus.executeAll() - this.editor.changeState(DDeiEditorState.DESIGNING); - DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_AFTER", DDeiEnumOperateType.CREATE, { models: models }, ddInstance, e) - } - + let rsState = DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_BEFORE", DDeiEnumOperateType.CREATE, { models: models }, ddInstance, e) + if (rsState == 0 || rsState == 1) { + let pushDatas = [] + models.forEach((model, key) => { + pushDatas.push({ id: model.id, value: DDeiEnumControlState.SELECTED }); + }); + this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.CancelCurLevelSelectedModels, null, e); + this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.ModelChangeSelect, pushDatas, e); + this.editor.ddInstance?.bus?.push(DDeiEnumBusCommandType.StageChangeSelectModels); + this.editor.bus.executeAll() + this.editor.changeState(DDeiEditorState.DESIGNING); + DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_CREATE_AFTER", DDeiEnumOperateType.CREATE, { models: models }, ddInstance, e) + } + } } } diff --git a/src/App.vue b/src/App.vue index 591a77b..9ebe6a2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ export default defineComponent({ data() { const options = markRaw({ - // currentLayout: "ddei-core-layout-simple", + currentLayout: "ddei-core-layout-simple", config: { ratio: 1.2, //默认缩放比例为120% pixel:2, //调整渲染质量