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

修复了修改控件样式后，永久改变新控件默认样式的问题

Browse Source
This commit is contained in:
猴赛雷 2024-11-11 18:06:20 +08:00
parent 7780695079
commit 9720d71b1b
7 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package-lock.json generated
View File

@ -1,15 +1,15 @@
{ {
"name": "ddei-editor", "name": "ddei-editor",
"version": "1.2.42", "version": "1.2.43-1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ddei-editor", "name": "ddei-editor",
"version": "1.2.42", "version": "1.2.43-1",
"license": "Apache License 2.0", "license": "Apache License 2.0",
"dependencies": { "dependencies": {
"ddei-framework": "^1.2.42" "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.43-1.tgz"
}, },
"devDependencies": { "devDependencies": {
"@tsconfig/node18": "^18.2.0", "@tsconfig/node18": "^18.2.0",
@ -518,9 +518,10 @@
"integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g==" "integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g=="
}, },
"node_modules/ddei-framework": { "node_modules/ddei-framework": {
"version": "1.2.42", "version": "1.2.43-1",
"resolved": "https://registry.npmjs.org/ddei-framework/-/ddei-framework-1.2.42.tgz", "resolved": "file:../ddei-framework/ddei-framework-1.2.43-1.tgz",
"integrity": "sha512-LnwN3WTMuqSsl6QYyAQ+l71N7Qd2Tw0sxJWD95clyY6GKjrV62dDmzqumCEQQOzhyxeypBm3corX2Q+DG8QMyw==", "integrity": "sha512-Yf+hHjMhKSP1MA5yTl2pafow7P8WGuYTQvjnKkBBcMtB+Qng86UNjDjVpjNEJonDxpSHaDkqvLjdNDQEh5c+Gw==",
"license": "Apache License 2.0",
"dependencies": { "dependencies": {
"ddei-autolink": "^1.1.1", "ddei-autolink": "^1.1.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ddei-editor", "name": "ddei-editor",
"version": "1.2.42-1", "version": "1.2.43-1",
"private": false, "private": false,
"type": "module", "type": "module",
"author": "hoslay <3697355039@qq.com>", "author": "hoslay <3697355039@qq.com>",
@ -49,7 +49,7 @@
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false" "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
}, },
"dependencies": { "dependencies": {
"ddei-framework": "^1.2.42" "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.43-1.tgz"
}, },
"devDependencies": { "devDependencies": {
"@tsconfig/node18": "^18.2.0", "@tsconfig/node18": "^18.2.0",

5
plugins/core/hotkeys/actions/key-action-paste.ts
View File

@ -13,6 +13,7 @@ import {DDeiPolygon} from "ddei-framework";
import {DDeiLink} from "ddei-framework"; import {DDeiLink} from "ddei-framework";
import {DDeiModelLink} from "ddei-framework"; import {DDeiModelLink} from "ddei-framework";
import { DDeiEditorState, DDeiEditorUtil } 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) { for (let i in ccDefine?.define) {
dataJson[i] = ccDefine?.define[i]; dataJson[i] = cloneDeep(ccDefine?.define[i]);
} }
dataJson.text = textData; dataJson.text = textData;
dataJson.border = { type: 0 }; dataJson.border = { type: 0 };
@ -1172,7 +1173,7 @@ class DDeiKeyActionPaste extends DDeiKeyAction {
let ccDefine = DDeiUtil.getControlDefine(dataJson) let ccDefine = DDeiUtil.getControlDefine(dataJson)
for (let i in ccDefine?.define) { for (let i in ccDefine?.define) {
dataJson[i] = ccDefine?.define[i]; dataJson[i] = cloneDeep(ccDefine?.define[i]);
} }
dataJson.text = ""; dataJson.text = "";
dataJson.border = { type: 0 }; dataJson.border = { type: 0 };

2
plugins/core/hotkeys/actions/key-action-start-quick-edit.ts
View File

@ -215,7 +215,7 @@ class DDeiKeyActionStartQuickEdit extends DDeiKeyAction {
let controlDefine = DDeiUtil.getControlDefine(dataJson) let controlDefine = DDeiUtil.getControlDefine(dataJson)
for (let i in controlDefine?.define) { for (let i in controlDefine?.define) {
dataJson[i] = controlDefine.define[i]; dataJson[i] = cloneDeep(controlDefine.define[i]);
} }
dataJson["id"] = "lsm_" + (stage.idIdx++) dataJson["id"] = "lsm_" + (stage.idIdx++)
dataJson["width"] = 80 dataJson["width"] = 80

2
plugins/core/panels/simple/TopMenuSimple.vue
View File

@ -510,7 +510,7 @@ export default {
.ddei-core-panel-topmenu-simple { .ddei-core-panel-topmenu-simple {
text-align: center; text-align: center;
position: absolute; position: absolute;
color:var(--text);
z-index: 99999; z-index: 99999;
border: 1px solid var(--panel-border); border: 1px solid var(--panel-border);
box-shadow: 0px 2px 24px 0px hsl(0deg 0% 0% /0.25); box-shadow: 0px 2px 24px 0px hsl(0deg 0% 0% /0.25);

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, //调整渲染质量

2
vite.config.ts
View File

@ -13,7 +13,7 @@ export default defineConfig({
alias: { alias: {
'@': fileURLToPath(new URL('./src', import.meta.url)), '@': fileURLToPath(new URL('./src', import.meta.url)),
'@ddei': fileURLToPath(new URL('./plugins', 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)),
} }
}, },