diff --git a/package-lock.json b/package-lock.json index 65d1de9..c40f275 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "ddei-editor", - "version": "1.2.42", + "version": "1.2.43-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ddei-editor", - "version": "1.2.42", + "version": "1.2.43-1", "license": "Apache License 2.0", "dependencies": { - "ddei-framework": "^1.2.42" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.43-1.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.42", - "resolved": "https://registry.npmjs.org/ddei-framework/-/ddei-framework-1.2.42.tgz", - "integrity": "sha512-LnwN3WTMuqSsl6QYyAQ+l71N7Qd2Tw0sxJWD95clyY6GKjrV62dDmzqumCEQQOzhyxeypBm3corX2Q+DG8QMyw==", + "version": "1.2.43-1", + "resolved": "file:../ddei-framework/ddei-framework-1.2.43-1.tgz", + "integrity": "sha512-Yf+hHjMhKSP1MA5yTl2pafow7P8WGuYTQvjnKkBBcMtB+Qng86UNjDjVpjNEJonDxpSHaDkqvLjdNDQEh5c+Gw==", + "license": "Apache License 2.0", "dependencies": { "ddei-autolink": "^1.1.1", "lodash": "^4.17.21", diff --git a/package.json b/package.json index 299faa0..3acb351 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.42-1", + "version": "1.2.43-1", "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.42" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.43-1.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", diff --git a/plugins/core/hotkeys/actions/key-action-paste.ts b/plugins/core/hotkeys/actions/key-action-paste.ts index 90876b1..d99e785 100644 --- a/plugins/core/hotkeys/actions/key-action-paste.ts +++ b/plugins/core/hotkeys/actions/key-action-paste.ts @@ -13,6 +13,7 @@ import {DDeiPolygon} from "ddei-framework"; import {DDeiLink} from "ddei-framework"; import {DDeiModelLink} from "ddei-framework"; import { DDeiEditorState, DDeiEditorUtil } from "ddei-framework"; +import {cloneDeep} from "lodash" /** * 键行为:粘贴 * 粘贴剪切板内容 @@ -315,7 +316,7 @@ class DDeiKeyActionPaste extends DDeiKeyAction { }); for (let i in ccDefine?.define) { - dataJson[i] = ccDefine?.define[i]; + dataJson[i] = cloneDeep(ccDefine?.define[i]); } dataJson.text = textData; dataJson.border = { type: 0 }; @@ -1172,7 +1173,7 @@ class DDeiKeyActionPaste extends DDeiKeyAction { let ccDefine = DDeiUtil.getControlDefine(dataJson) for (let i in ccDefine?.define) { - dataJson[i] = ccDefine?.define[i]; + dataJson[i] = cloneDeep(ccDefine?.define[i]); } dataJson.text = ""; dataJson.border = { type: 0 }; diff --git a/plugins/core/hotkeys/actions/key-action-start-quick-edit.ts b/plugins/core/hotkeys/actions/key-action-start-quick-edit.ts index 5e41c99..131a069 100644 --- a/plugins/core/hotkeys/actions/key-action-start-quick-edit.ts +++ b/plugins/core/hotkeys/actions/key-action-start-quick-edit.ts @@ -215,7 +215,7 @@ class DDeiKeyActionStartQuickEdit extends DDeiKeyAction { let controlDefine = DDeiUtil.getControlDefine(dataJson) for (let i in controlDefine?.define) { - dataJson[i] = controlDefine.define[i]; + dataJson[i] = cloneDeep(controlDefine.define[i]); } dataJson["id"] = "lsm_" + (stage.idIdx++) dataJson["width"] = 80 diff --git a/plugins/core/panels/simple/TopMenuSimple.vue b/plugins/core/panels/simple/TopMenuSimple.vue index d79c3ad..10a1d39 100644 --- a/plugins/core/panels/simple/TopMenuSimple.vue +++ b/plugins/core/panels/simple/TopMenuSimple.vue @@ -510,7 +510,7 @@ export default { .ddei-core-panel-topmenu-simple { text-align: center; position: absolute; - + color:var(--text); z-index: 99999; border: 1px solid var(--panel-border); box-shadow: 0px 2px 24px 0px hsl(0deg 0% 0% /0.25); diff --git a/src/App.vue b/src/App.vue index 80b11e0..b091625 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, //调整渲染质量 diff --git a/vite.config.ts b/vite.config.ts index 2e5fa43..2cf521e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -13,7 +13,7 @@ export default defineConfig({ alias: { '@': fileURLToPath(new URL('./src', import.meta.url)), '@ddei': fileURLToPath(new URL('./plugins', import.meta.url)), - // 'ddei-framework': fileURLToPath(new URL('/Users/hoslay/work/ddei/ddei-framework/dist/ddei-framework.js', import.meta.url)), + 'ddei-framework': fileURLToPath(new URL('/Users/hoslay/work/ddei/ddei-framework/dist/ddei-framework.js', import.meta.url)), } },