diff --git a/package-lock.json b/package-lock.json index 25b9b1e..cd1cdff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "ddei-editor", - "version": "1.2.11-6", + "version": "1.2.11-12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ddei-editor", - "version": "1.2.11-6", + "version": "1.2.11-12", "license": "Apache License 2.0", "dependencies": { - "ddei-framework": "file:../ddei-framework/ddei-framework-1.2.35-3.tgz" + "ddei-framework": "file:../ddei-framework/ddei-framework-1.2.35-8.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", @@ -518,9 +518,9 @@ "integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g==" }, "node_modules/ddei-framework": { - "version": "1.2.35-3", - "resolved": "file:../ddei-framework/ddei-framework-1.2.35-3.tgz", - "integrity": "sha512-E6EHBybuiDgMkC1WhZvZ4LkUi2OLAsjBSCHECdUqOlHXCWvw7i1W4aISe8M5BL7pvnFQXPboB9En1q7+6HV1tQ==", + "version": "1.2.35-8", + "resolved": "file:../ddei-framework/ddei-framework-1.2.35-8.tgz", + "integrity": "sha512-MIvzLlyKZlb7+fjFdy3G5/g49pvzmLLw+aC4E4SXKG9vufBYV53bvgreaZQHDaXDEOUgrRH09Q2J8x0XBdG54Q==", "license": "Apache License 2.0", "dependencies": { "ddei-autolink": "^1.1.1", diff --git a/package.json b/package.json index 10c2d16..4f2f801 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.11-6", + "version": "1.2.11-19", "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": "file:../ddei-framework/ddei-framework-1.2.35-3.tgz" + "ddei-framework": "file:../ddei-framework/ddei-framework-1.2.35-8.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", diff --git a/plugins/core/controls/control/stage.ts b/plugins/core/controls/control/stage.ts index 5b916cb..45d12f7 100644 --- a/plugins/core/controls/control/stage.ts +++ b/plugins/core/controls/control/stage.ts @@ -136,7 +136,7 @@ export default { }, 'itemStyle': { width: 80, height: 25, col: 2, row: 0, imgWidth: 20, imgHeight: 20 }, 'canSearch': true, - 'defaultValue': "Microsoft YaHei", + 'defaultValue': "", }, { 'code': 'mark.font.size', diff --git a/plugins/core/dialogs/QCViewDialog.vue b/plugins/core/dialogs/QCViewDialog.vue index 4aa9033..7e6e618 100644 --- a/plugins/core/dialogs/QCViewDialog.vue +++ b/plugins/core/dialogs/QCViewDialog.vue @@ -73,11 +73,13 @@ export default { left: 0px; display: none; bottom: 16px; - height: 34px; + height: 48px; .icon { font-size: 18px; + width:18px; + height:18px; } .items { diff --git a/plugins/core/panels/bottom/ChangeRatio.vue b/plugins/core/panels/bottom/ChangeRatio.vue index 96f4599..e334e5c 100644 --- a/plugins/core/panels/bottom/ChangeRatio.vue +++ b/plugins/core/panels/bottom/ChangeRatio.vue @@ -5,7 +5,7 @@ :class="{ 'ddei-core-panel-bottom-changeratio__combox': true,'ddei-core-panel-bottom-changeratio__combox__dialog':dialog}" @click="dialog && showChangeRatioDialog($event)"> - {{ parseInt(editor?.currentStage?.ratio * 100) }}% + {{ parseInt(currentStage?.ratio * 100) }}% - {{ parseInt(editor?.currentStage?.ratio * 100) }}% + {{ parseInt(currentStage?.ratio * 100) }}%
diff --git a/src/assets/fonts/iconfont/iconfont.css b/src/assets/fonts/iconfont/iconfont.css index e358a4d..4f26783 100644 --- a/src/assets/fonts/iconfont/iconfont.css +++ b/src/assets/fonts/iconfont/iconfont.css @@ -8,6 +8,8 @@ .icon { font-family: "iconfont" !important; font-size: 26px; + width: 26px; + height: 26px; color: #424242; font-style: normal; -webkit-font-smoothing: antialiased; diff --git a/src/editor/Editor.vue b/src/editor/Editor.vue index 23a05f6..27668f4 100644 --- a/src/editor/Editor.vue +++ b/src/editor/Editor.vue @@ -202,7 +202,7 @@ export default {