From 0d8c268d6855146658387389f90f4829b58d28fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=B4=E8=B5=9B=E9=9B=B7?= Date: Tue, 15 Oct 2024 14:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E8=A7=84=E8=8C=83=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E5=9B=BE=E6=A0=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 12 +- package.json | 4 +- .../core/components/buttons/QBTBorderDash.vue | 2 +- .../components/buttons/QBTBorderWeight.vue | 2 +- .../core/components/buttons/QBTFontFamily.vue | 2 +- .../core/components/buttons/QBTFontSize.vue | 2 +- .../components/buttons/QBTLinePointType.vue | 2 +- plugins/core/controls/control/base/line.ts | 4 +- plugins/core/controls/control/base/polygon.ts | 2 +- plugins/core/controls/control/basic/text.ts | 2 +- .../core/controls/control/common/comment1.ts | 2 +- plugins/core/controls/control/layer.ts | 2 +- plugins/core/controls/control/stage.ts | 2 +- plugins/core/dialogs/AlignDialog.vue | 16 +- .../core/dialogs/ChooseControlGroupDialog.vue | 8 +- .../core/dialogs/CloseFileConfirmDialog.vue | 4 +- .../core/dialogs/CollFileConfirmDialog.vue | 2 +- plugins/core/dialogs/ManageLayersDialog.vue | 18 +- plugins/core/dialogs/MergeComposeDialog.vue | 4 +- plugins/core/dialogs/PositionDialog.vue | 8 +- .../core/dialogs/PublishFileConfirmDialog.vue | 4 +- plugins/core/dialogs/RotateDialog.vue | 10 +- plugins/core/menus/menu-copy-sheet.ts | 2 +- plugins/core/menus/menu-remove-sheet.ts | 2 +- plugins/core/panels/bottom/ChangeRatio.vue | 8 +- plugins/core/panels/bottom/ManageLayers.vue | 2 +- plugins/core/panels/bottom/Play.vue | 2 +- plugins/core/panels/bottom/Sheets.vue | 6 +- plugins/core/panels/bottom/SuitRatio.vue | 2 +- .../core/panels/common/ExportAndImport.vue | 4 +- plugins/core/panels/common/FileInfo.vue | 12 +- plugins/core/panels/common/FontAndText.vue | 39 +- plugins/core/panels/common/Operate.vue | 8 +- plugins/core/panels/common/Sort.vue | 16 +- plugins/core/panels/common/Tool.vue | 6 +- .../panels/openfilesview/OpenFilesView.vue | 12 +- .../core/panels/propertyview/PropertyView.vue | 6 +- .../core/panels/quickcolor/QuickColorView.vue | 6 +- plugins/core/panels/simple/toolbox-simple.ts | 4 +- plugins/core/panels/toolbox/Toolbox.vue | 10 +- plugins/core/propeditors/PVBaseCombox.vue | 2 +- .../propeditors/PVBorderDashComboEditor.vue | 2 +- .../core/propeditors/PVColorComboEditor.vue | 2 +- plugins/core/propeditors/PVImageEditor.vue | 2 +- .../quickcontrol/QuickChooseControlDialog.vue | 1 + plugins/quickstyle/CanvasQuickDialog.vue | 42 +- plugins/search/SearchPanel.vue | 12 +- plugins/tooltip/TooltipDialog.vue | 4 +- src/App.vue | 46 +- src/assets/fonts/iconfont/demo.css | 539 ++++++++++++++++++ src/assets/fonts/iconfont/iconfont.css | 259 ++++----- src/assets/fonts/iconfont/iconfont.js | 2 +- src/assets/fonts/iconfont/iconfont.json | 512 ++++++++--------- src/assets/fonts/iconfont/iconfont.ttf | Bin 33744 -> 33396 bytes src/assets/fonts/iconfont/iconfont.woff | Bin 17384 -> 17692 bytes src/assets/fonts/iconfont/iconfont.woff2 | Bin 14100 -> 14440 bytes src/controldefinesdemo.ts | 4 +- 57 files changed, 1117 insertions(+), 573 deletions(-) create mode 100644 src/assets/fonts/iconfont/demo.css diff --git a/package-lock.json b/package-lock.json index b042127..3fcb15d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "ddei-editor", - "version": "1.2.41-200", + "version": "1.2.41-201", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ddei-editor", - "version": "1.2.41-200", + "version": "1.2.41-201", "license": "Apache License 2.0", "dependencies": { - "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-200.tgz" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-201.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.41-200", - "resolved": "file:../ddei-framework/ddei-framework-1.2.41-200.tgz", - "integrity": "sha512-EDYhgdvXN2Y0iFkHyfIiPQ/FB8D78X/fjHLyvLZZJB9UhoTdEunIm5+2Gegl78Am5Ri1f75BdswbVI8q5HTyyQ==", + "version": "1.2.41-201", + "resolved": "file:../ddei-framework/ddei-framework-1.2.41-201.tgz", + "integrity": "sha512-WKsM8XduU5MruGAgIlH2qIbUCxa+1rQ9yhhBdntcHVhy6U4Q2U0cL+gPbncwjJhooXPCi3vxD8f9zBKRKKzOaA==", "license": "Apache License 2.0", "dependencies": { "ddei-autolink": "^1.1.1", diff --git a/package.json b/package.json index 12265b5..259e494 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.41-200", + "version": "1.2.41-202", "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:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-200.tgz" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-201.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", diff --git a/plugins/core/components/buttons/QBTBorderDash.vue b/plugins/core/components/buttons/QBTBorderDash.vue index f3694eb..83a1d46 100644 --- a/plugins/core/components/buttons/QBTBorderDash.vue +++ b/plugins/core/components/buttons/QBTBorderDash.vue @@ -9,7 +9,7 @@
diff --git a/plugins/core/components/buttons/QBTBorderWeight.vue b/plugins/core/components/buttons/QBTBorderWeight.vue index dbac25f..cfe6bef 100644 --- a/plugins/core/components/buttons/QBTBorderWeight.vue +++ b/plugins/core/components/buttons/QBTBorderWeight.vue @@ -8,7 +8,7 @@
diff --git a/plugins/core/components/buttons/QBTFontFamily.vue b/plugins/core/components/buttons/QBTFontFamily.vue index 0f8b709..eb3eff8 100644 --- a/plugins/core/components/buttons/QBTFontFamily.vue +++ b/plugins/core/components/buttons/QBTFontFamily.vue @@ -9,7 +9,7 @@
diff --git a/plugins/core/components/buttons/QBTFontSize.vue b/plugins/core/components/buttons/QBTFontSize.vue index e3b401f..a50aa78 100644 --- a/plugins/core/components/buttons/QBTFontSize.vue +++ b/plugins/core/components/buttons/QBTFontSize.vue @@ -8,7 +8,7 @@
diff --git a/plugins/core/components/buttons/QBTLinePointType.vue b/plugins/core/components/buttons/QBTLinePointType.vue index 0de162e..facbdf8 100644 --- a/plugins/core/components/buttons/QBTLinePointType.vue +++ b/plugins/core/components/buttons/QBTLinePointType.vue @@ -7,7 +7,7 @@
diff --git a/plugins/core/controls/control/base/line.ts b/plugins/core/controls/control/base/line.ts index c984323..90f4066 100644 --- a/plugins/core/controls/control/base/line.ts +++ b/plugins/core/controls/control/base/line.ts @@ -234,7 +234,7 @@ export default { }, { name: "属性", - icon: 'icon-a-ziyuan409', + icon: 'icon-edit-properies', subGroups: [ { name: "属性", @@ -248,7 +248,7 @@ export default { ], icon: ``, filters:{ LINE_OBI_FILTER: (model, params)=>{ diff --git a/plugins/core/controls/control/base/polygon.ts b/plugins/core/controls/control/base/polygon.ts index 67d97d7..d82b032 100644 --- a/plugins/core/controls/control/base/polygon.ts +++ b/plugins/core/controls/control/base/polygon.ts @@ -528,7 +528,7 @@ export default { }, { name: "数据", - icon: 'icon-a-ziyuan409', + icon: 'icon-edit-properies', subGroups: [ { name: "基础信息", diff --git a/plugins/core/controls/control/basic/text.ts b/plugins/core/controls/control/basic/text.ts index e199edc..2ddbb53 100644 --- a/plugins/core/controls/control/basic/text.ts +++ b/plugins/core/controls/control/basic/text.ts @@ -41,7 +41,7 @@ export default { }, { name: "数据", - icon: 'icon-a-ziyuan409', + icon: 'icon-edit-properies', subGroups: [ { name: "数据属性", diff --git a/plugins/core/controls/control/common/comment1.ts b/plugins/core/controls/control/common/comment1.ts index 4c5e4ec..3c7ce46 100644 --- a/plugins/core/controls/control/common/comment1.ts +++ b/plugins/core/controls/control/common/comment1.ts @@ -195,7 +195,7 @@ export default { }, { name: "数据", - icon: 'icon-a-ziyuan409', + icon: 'icon-edit-properies', subGroups: [ { name: "数据属性", diff --git a/plugins/core/controls/control/layer.ts b/plugins/core/controls/control/layer.ts index 227d949..7392c25 100644 --- a/plugins/core/controls/control/layer.ts +++ b/plugins/core/controls/control/layer.ts @@ -103,7 +103,7 @@ export default { groups: [ { name: "背景", - icon: 'icon-a-ziyuan419', + icon: 'icon-background', subGroups: [ { name: "背景", diff --git a/plugins/core/controls/control/stage.ts b/plugins/core/controls/control/stage.ts index 45d12f7..ab47967 100644 --- a/plugins/core/controls/control/stage.ts +++ b/plugins/core/controls/control/stage.ts @@ -209,7 +209,7 @@ export default { groups: [ { name: "样式", - icon: 'icon-a-ziyuan418', + icon: 'icon-setting', subGroups: [ { name: "纸张", diff --git a/plugins/core/dialogs/AlignDialog.vue b/plugins/core/dialogs/AlignDialog.vue index 16578fd..535505b 100644 --- a/plugins/core/dialogs/AlignDialog.vue +++ b/plugins/core/dialogs/AlignDialog.vue @@ -7,32 +7,32 @@
@@ -42,12 +42,12 @@
diff --git a/plugins/core/dialogs/ChooseControlGroupDialog.vue b/plugins/core/dialogs/ChooseControlGroupDialog.vue index 3159741..5c78c43 100644 --- a/plugins/core/dialogs/ChooseControlGroupDialog.vue +++ b/plugins/core/dialogs/ChooseControlGroupDialog.vue @@ -5,20 +5,20 @@
基本
UML
diff --git a/plugins/core/dialogs/CloseFileConfirmDialog.vue b/plugins/core/dialogs/CloseFileConfirmDialog.vue index cadb2b4..0ea78e4 100644 --- a/plugins/core/dialogs/CloseFileConfirmDialog.vue +++ b/plugins/core/dialogs/CloseFileConfirmDialog.vue @@ -3,12 +3,12 @@
是否保存文件？
diff --git a/plugins/core/dialogs/CollFileConfirmDialog.vue b/plugins/core/dialogs/CollFileConfirmDialog.vue index 4e0d58f..1231871 100644 --- a/plugins/core/dialogs/CollFileConfirmDialog.vue +++ b/plugins/core/dialogs/CollFileConfirmDialog.vue @@ -8,7 +8,7 @@ 收藏文件
diff --git a/plugins/core/dialogs/ManageLayersDialog.vue b/plugins/core/dialogs/ManageLayersDialog.vue index d7d7b9a..1c12116 100644 --- a/plugins/core/dialogs/ManageLayersDialog.vue +++ b/plugins/core/dialogs/ManageLayersDialog.vue @@ -7,7 +7,7 @@
新建图层
形状:{{ layer.modelNumber }} - - + + - - + + - - + +
diff --git a/plugins/core/dialogs/MergeComposeDialog.vue b/plugins/core/dialogs/MergeComposeDialog.vue index 8dbb876..fea3f37 100644 --- a/plugins/core/dialogs/MergeComposeDialog.vue +++ b/plugins/core/dialogs/MergeComposeDialog.vue @@ -6,14 +6,14 @@
组合
取消组合
diff --git a/plugins/core/dialogs/PositionDialog.vue b/plugins/core/dialogs/PositionDialog.vue index 5bc3b07..19dc135 100644 --- a/plugins/core/dialogs/PositionDialog.vue +++ b/plugins/core/dialogs/PositionDialog.vue @@ -7,28 +7,28 @@
置于顶层
置于底层
上移一层
下移一层
diff --git a/plugins/core/dialogs/PublishFileConfirmDialog.vue b/plugins/core/dialogs/PublishFileConfirmDialog.vue index 4ef2bd9..ee1fd10 100644 --- a/plugins/core/dialogs/PublishFileConfirmDialog.vue +++ b/plugins/core/dialogs/PublishFileConfirmDialog.vue @@ -3,12 +3,12 @@
发布文件
diff --git a/plugins/core/dialogs/RotateDialog.vue b/plugins/core/dialogs/RotateDialog.vue index 958fb32..5ed1c9b 100644 --- a/plugins/core/dialogs/RotateDialog.vue +++ b/plugins/core/dialogs/RotateDialog.vue @@ -7,12 +7,12 @@
@@ -22,17 +22,17 @@
diff --git a/plugins/core/menus/menu-copy-sheet.ts b/plugins/core/menus/menu-copy-sheet.ts index 5e2560f..41eae08 100644 --- a/plugins/core/menus/menu-copy-sheet.ts +++ b/plugins/core/menus/menu-copy-sheet.ts @@ -21,7 +21,7 @@ class MenuCopySheet extends DDeiMenuBase { defaultOptions: object = { 'label': '复制', - 'icon': '#icon-a-ziyuan488', + 'icon': '#icon-paste', 'models': ["DDeiSheet"], 'disabled': false } diff --git a/plugins/core/menus/menu-remove-sheet.ts b/plugins/core/menus/menu-remove-sheet.ts index 619b8aa..529e217 100644 --- a/plugins/core/menus/menu-remove-sheet.ts +++ b/plugins/core/menus/menu-remove-sheet.ts @@ -22,7 +22,7 @@ class MenuRemoveSheet extends DDeiMenuBase { defaultOptions: object = { 'label': '删除', - 'icon': '#icon-a-ziyuan401', + 'icon': '#icon-remove', 'models':["DDeiSheet"], 'disabled': false } diff --git a/plugins/core/panels/bottom/ChangeRatio.vue b/plugins/core/panels/bottom/ChangeRatio.vue index 26ee317..38ddd5b 100644 --- a/plugins/core/panels/bottom/ChangeRatio.vue +++ b/plugins/core/panels/bottom/ChangeRatio.vue @@ -8,13 +8,13 @@ {{ parseInt(currentStage?.ratio * 100) }}%
diff --git a/plugins/core/panels/bottom/ManageLayers.vue b/plugins/core/panels/bottom/ManageLayers.vue index 398ef40..87cb781 100644 --- a/plugins/core/panels/bottom/ManageLayers.vue +++ b/plugins/core/panels/bottom/ManageLayers.vue @@ -1,7 +1,7 @@ diff --git a/plugins/core/panels/bottom/Play.vue b/plugins/core/panels/bottom/Play.vue index 53602f6..11c4088 100644 --- a/plugins/core/panels/bottom/Play.vue +++ b/plugins/core/panels/bottom/Play.vue @@ -1,7 +1,7 @@ diff --git a/plugins/core/panels/bottom/Sheets.vue b/plugins/core/panels/bottom/Sheets.vue index 54d4af5..38a12aa 100644 --- a/plugins/core/panels/bottom/Sheets.vue +++ b/plugins/core/panels/bottom/Sheets.vue @@ -2,7 +2,7 @@
@@ -21,13 +21,13 @@
diff --git a/plugins/core/panels/bottom/SuitRatio.vue b/plugins/core/panels/bottom/SuitRatio.vue index 4b882ea..ecdce99 100644 --- a/plugins/core/panels/bottom/SuitRatio.vue +++ b/plugins/core/panels/bottom/SuitRatio.vue @@ -1,7 +1,7 @@ diff --git a/plugins/core/panels/common/ExportAndImport.vue b/plugins/core/panels/common/ExportAndImport.vue index 14a5d86..074894b 100644 --- a/plugins/core/panels/common/ExportAndImport.vue +++ b/plugins/core/panels/common/ExportAndImport.vue @@ -5,7 +5,7 @@
下载
@@ -13,7 +13,7 @@