diff --git a/package-lock.json b/package-lock.json index a7e2248..ea84743 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "ddei-editor", - "version": "1.2.41-5", + "version": "1.2.42-7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ddei-editor", - "version": "1.2.41-5", + "version": "1.2.42-7", "license": "Apache License 2.0", "dependencies": { - "ddei-framework": "^1.2.41-5" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.42-7.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", @@ -518,9 +518,10 @@ "integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g==" }, "node_modules/ddei-framework": { - "version": "1.2.41-5", - "resolved": "https://registry.npmjs.org/ddei-framework/-/ddei-framework-1.2.41-5.tgz", - "integrity": "sha512-fBtVHqvbIA3dRfO4wSoSYNIMwqG9x8rzaw8oINCs8X3/O2wuXRblm7JYVKYl6lRjmC34XnSoC0ey90SdAlbrsg==", + "version": "1.2.42-7", + "resolved": "file:../ddei-framework/ddei-framework-1.2.42-7.tgz", + "integrity": "sha512-/BGocQxCUx0+N+ENnhfgqfd/5Bp7ocAIPNUAe2cT6DzWSuvGOqplxf+tDZdcQZj9i9F0MKz9FT5hSEWs2Gd3Bw==", + "license": "Apache License 2.0", "dependencies": { "ddei-autolink": "^1.1.1", "lodash": "^4.17.21", diff --git a/package.json b/package.json index 004d35e..cb2cb96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.42-6", + "version": "1.2.42-7", "private": false, "type": "module", "author": "hoslay <3697355039@qq.com>", @@ -49,7 +49,7 @@ "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false" }, "dependencies": { - "ddei-framework": "^1.2.41-5" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.42-7.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", diff --git a/plugins/core/hotkeys/actions/key-action-cancel-quick-edit.ts b/plugins/core/hotkeys/actions/key-action-cancel-quick-edit.ts index 1d26e96..155ed89 100644 --- a/plugins/core/hotkeys/actions/key-action-cancel-quick-edit.ts +++ b/plugins/core/hotkeys/actions/key-action-cancel-quick-edit.ts @@ -63,8 +63,6 @@ class DDeiKeyActionCancelQuickEdit extends DDeiKeyAction { ddInstance.stage.render.editorShadowControl.destroyed() } ddInstance.stage.render.editorShadowControl = null; - - ddInstance.stage.render.editorShadowControl.destr editor.quickEditorModel = null delete ddInstance.stage.brushDataText editor.changeState(DDeiEditorState.DESIGNING); diff --git a/plugins/core/panels/canvasview/CanvasView.vue b/plugins/core/panels/canvasview/CanvasView.vue index c7af2c6..1e58f36 100644 --- a/plugins/core/panels/canvasview/CanvasView.vue +++ b/plugins/core/panels/canvasview/CanvasView.vue @@ -77,7 +77,28 @@ export default { middleCanvasPos.left + 5 <= evt.clientX && middleCanvasPos.left + middleCanvas.offsetWidth - 5 >= evt.clientX ) { - this.editor?.hotkeys['ddei-core-keyaction-quickedit-start']?.action(evt,this.editor.ddInstance); + let ddInstance = this.editor.ddInstance; + let stage = ddInstance.stage + //判断是否在某个控件上 + let ex = evt.offsetX; + let ey = evt.offsetY; + ex /= window.remRatio + ey /= window.remRatio + + ex -= stage.wpv.x; + ey -= stage.wpv.y; + + let stageRatio = stage.getStageRatio() + let ex2 = ex / stageRatio + let ey2 = ey / stageRatio + + let operateControls = DDeiAbstractShape.findBottomModelsByArea(stage.layers[stage.layerIndex], ex2, ey2, true, true); + if (operateControls != null && operateControls.length > 0) { + let rsState = DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_DBL_CLICK", "DBL_CLICK", { models: operateControls, ex: ex, ey: ey }, ddInstance, null) + if (rsState == 0 || rsState == 1) { + this.editor?.hotkeys['ddei-core-keyaction-quickedit-start']?.action(evt,this.editor.ddInstance); + } + } } }, /** diff --git a/src/App.vue b/src/App.vue index 6787563..2d6d10b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,6 +24,7 @@ export default defineComponent({ config: { ratio: 1.2, //默认缩放比例为120% pixel:2, //调整渲染质量 + // paper:"A6", // "mark": "水印文本", // EXT_STAGE_WIDTH: false,