From b3258dc1668b17eea7fef4797ad1326a3424b91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=B4=E8=B5=9B=E9=9B=B7?= Date: Thu, 7 Nov 2024 14:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=87=AA=E5=B8=A6=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6=E9=9D=A2=E6=9D=BF=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E4=BA=86=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/core/dialogs/ChooseControlDialog.vue | 2 +- plugins/core/dialogs/CloseFileConfirmDialog.vue | 8 ++++---- plugins/core/dialogs/PublishFileConfirmDialog.vue | 6 +++--- plugins/core/i18n/en_US.ts | 4 ++++ plugins/core/i18n/zh_CN.ts | 10 ++++++++-- plugins/core/menus/menu-copy-sheet.ts | 6 +++--- plugins/core/menus/menu-remove-sheet.ts | 2 +- plugins/core/panels/common/FileOperate.vue | 10 +++++----- plugins/core/panels/simple/ToolboxSimple.vue | 4 ++-- plugins/core/panels/simple/TopMenuSimple.vue | 4 ++-- plugins/quickcontrol/QuickChooseControlDialog.vue | 2 +- plugins/search/SearchPanel.vue | 14 +++++++++----- plugins/tooltip/tooltip-lifecycle.ts | 4 ++-- src/editor/MenuDialog.vue | 4 ++-- src/editor/grouputil.ts | 2 ++ 15 files changed, 49 insertions(+), 33 deletions(-) diff --git a/plugins/core/dialogs/ChooseControlDialog.vue b/plugins/core/dialogs/ChooseControlDialog.vue index ce85a02..896b7bd 100644 --- a/plugins/core/dialogs/ChooseControlDialog.vue +++ b/plugins/core/dialogs/ChooseControlDialog.vue @@ -9,7 +9,7 @@ v-for="control in group.controls">
-
{{ control.name }}
+
{{ editor.i18n(control.name) }}
diff --git a/plugins/core/dialogs/CloseFileConfirmDialog.vue b/plugins/core/dialogs/CloseFileConfirmDialog.vue index 0ea78e4..959f6f0 100644 --- a/plugins/core/dialogs/CloseFileConfirmDialog.vue +++ b/plugins/core/dialogs/CloseFileConfirmDialog.vue @@ -5,7 +5,7 @@ - 是否保存文件？ + {{ editor.i18n('ddei.confirm-save-file') }}
-
保存
-
不保存
-
取消
+
{{ editor.i18n('ddei.save') }}
+
{{ editor.i18n('ddei.abort') }}
+
{{ editor.i18n('ddei.cancel') }}
diff --git a/plugins/core/dialogs/PublishFileConfirmDialog.vue b/plugins/core/dialogs/PublishFileConfirmDialog.vue index ee1fd10..65418ee 100644 --- a/plugins/core/dialogs/PublishFileConfirmDialog.vue +++ b/plugins/core/dialogs/PublishFileConfirmDialog.vue @@ -5,7 +5,7 @@ - 发布文件 + {{ editor.i18n('ddei.publish') }}{{ editor.i18n('ddei.file') }}
-
发布
-
取消
+
{{ editor.i18n('ddei.publish') }}
+
{{ editor.i18n('ddei.cancel') }}
diff --git a/plugins/core/i18n/en_US.ts b/plugins/core/i18n/en_US.ts index bcf2d64..9f19fc0 100644 --- a/plugins/core/i18n/en_US.ts +++ b/plugins/core/i18n/en_US.ts @@ -4,6 +4,8 @@ export default { new: 'New', open: 'Open', save: 'Save', + abort: 'Abort', + publish: 'Publish', download: 'Download', export: 'Export', import: 'Import', @@ -32,6 +34,7 @@ export default { setting: 'Setting', cut: 'Cut', copy: 'Copy', + delete: 'Delete', paste: 'Paste', more: 'More', page: 'Page', @@ -53,6 +56,7 @@ export default { moveStage: "Move", linkLine: "Line", search: "Search", + replace: "Replace", fileDescription: "DDei Design File", wholePage: "Whole Page", precent: "Pre", diff --git a/plugins/core/i18n/zh_CN.ts b/plugins/core/i18n/zh_CN.ts index 3837649..63f5f64 100644 --- a/plugins/core/i18n/zh_CN.ts +++ b/plugins/core/i18n/zh_CN.ts @@ -4,6 +4,8 @@ export default { new: '新建', open: '打开', save: '保存', + abort:'放弃', + publish: '发布', download: '下载', export: '导出', import: '导入', @@ -34,6 +36,7 @@ export default { setting: '设置', cut:'剪切', copy:'复制', + delete:'删除', paste:'粘贴', more: '更多', page: '页面', @@ -53,7 +56,8 @@ export default { choose: "选择", moveStage: "移动画布", linkLine: "连接线", - search:"搜索", + search: "搜索", + replace: "替换", fileDescription: "DDei设计文件", wholePage: "整页", precent: "百分比", @@ -286,6 +290,8 @@ export default { "standard": "标准颜色", "recently": "最近使用", "choosed": "已选颜色", - } + }, + + "confirm-save-file":"是否保存文件？", } }; \ No newline at end of file diff --git a/plugins/core/menus/menu-copy-sheet.ts b/plugins/core/menus/menu-copy-sheet.ts index 41eae08..773c35b 100644 --- a/plugins/core/menus/menu-copy-sheet.ts +++ b/plugins/core/menus/menu-copy-sheet.ts @@ -20,7 +20,7 @@ class MenuCopySheet extends DDeiMenuBase { static defaultIns: MenuCopySheet = new MenuCopySheet(); defaultOptions: object = { - 'label': '复制', + 'label': 'ddei.copy', 'icon': '#icon-paste', 'models': ["DDeiSheet"], 'disabled': false @@ -78,9 +78,9 @@ class MenuCopySheet extends DDeiMenuBase { let newSheet = DDeiSheet.loadFromJSON(sheetJson, { currentDdInstance: ddInstance }); - + let pageText = editor.i18n('ddei.page'); file.sheets.splice(file?.currentSheetIndex + 1, 0, newSheet); - newSheet.name = "页面-" + file.sheets.length + newSheet.name = pageText+"-" + file.sheets.length file.changeSheet(file.currentSheetIndex + 1); let stage = newSheet.stage; stage.ddInstance = ddInstance; diff --git a/plugins/core/menus/menu-remove-sheet.ts b/plugins/core/menus/menu-remove-sheet.ts index 529e217..cc7b6f9 100644 --- a/plugins/core/menus/menu-remove-sheet.ts +++ b/plugins/core/menus/menu-remove-sheet.ts @@ -21,7 +21,7 @@ class MenuRemoveSheet extends DDeiMenuBase { static defaultIns: MenuRemoveSheet = new MenuRemoveSheet(); defaultOptions: object = { - 'label': '删除', + 'label': 'ddei.delete', 'icon': '#icon-remove', 'models':["DDeiSheet"], 'disabled': false diff --git a/plugins/core/panels/common/FileOperate.vue b/plugins/core/panels/common/FileOperate.vue index 6b3e371..23679aa 100644 --- a/plugins/core/panels/common/FileOperate.vue +++ b/plugins/core/panels/common/FileOperate.vue @@ -3,24 +3,24 @@
-
新建
+
{{ editor.i18n('ddei.new') }}
-
保存
+
{{ editor.i18n('ddei.save') }}
-
打开
+
{{ editor.i18n('ddei.open') }}
-
下载
+
{{ editor.i18n('ddei.download') }}
- 保存 + {{ editor.i18n('ddei.save') }}
diff --git a/plugins/core/panels/simple/ToolboxSimple.vue b/plugins/core/panels/simple/ToolboxSimple.vue index 873208a..b37bc14 100644 --- a/plugins/core/panels/simple/ToolboxSimple.vue +++ b/plugins/core/panels/simple/ToolboxSimple.vue @@ -521,8 +521,8 @@ export default { align-items: center; >img { - margin-top: -1px; - margin-left: -1px; + margin-top: 2px; + margin-left: 2px; } &:hover { diff --git a/plugins/core/panels/simple/TopMenuSimple.vue b/plugins/core/panels/simple/TopMenuSimple.vue index c145efb..2f97007 100644 --- a/plugins/core/panels/simple/TopMenuSimple.vue +++ b/plugins/core/panels/simple/TopMenuSimple.vue @@ -523,8 +523,8 @@ export default { align-items: center; .item { - width: 60px; - + min-width: 60px; + padding:0 10px; height: 24px; border-radius: 3px; display: flex; diff --git a/plugins/quickcontrol/QuickChooseControlDialog.vue b/plugins/quickcontrol/QuickChooseControlDialog.vue index d949d23..177438b 100644 --- a/plugins/quickcontrol/QuickChooseControlDialog.vue +++ b/plugins/quickcontrol/QuickChooseControlDialog.vue @@ -7,7 +7,7 @@ v-for="control in group.controls" @click="quickCreateControl(control.id)">
-
{{ control.name }}
+
{{ editor.i18n(control.name)}}
diff --git a/plugins/search/SearchPanel.vue b/plugins/search/SearchPanel.vue index 1b09b73..efde81e 100644 --- a/plugins/search/SearchPanel.vue +++ b/plugins/search/SearchPanel.vue @@ -9,8 +9,8 @@
+ ref="searchBoxInput" @keydown="executeQuery($event)" @focus="changeEditorState" + :placeholder="editor.i18n('ddei.search')" autocomplete="off" />
-
- 第{{ editor.search?.resultIndex+1 }}项，共{{ editor.search?.result?.length }}项 +
+ 第{{ editor.search?.resultIndex + 1 }}项，共{{ editor.search?.result?.length }}项 +
+
+ {{editor.search?.resultIndex + 1}}/{{editor.search?.result?.length }}
@@ -52,7 +55,8 @@
+ v-model="replaceText" @focus="changeEditorState" :placeholder="editor.i18n('ddei.replace')" + autocomplete="off" />
diff --git a/plugins/tooltip/tooltip-lifecycle.ts b/plugins/tooltip/tooltip-lifecycle.ts index 2122d72..a1c651f 100644 --- a/plugins/tooltip/tooltip-lifecycle.ts +++ b/plugins/tooltip/tooltip-lifecycle.ts @@ -34,11 +34,11 @@ class DDeiExtTooltipLifeCycle extends DDeiLifeCycle { return DDeiExtTooltipLifeCycle; } - EVENT_MOUSE_IN_AREA: DDeiFuncData | null = new DDeiFuncData("tooltip-show", 1, (operateType, data, ddInstance, evt)=>{ + EVENT_MOUSE_MOVE_IN_CONTROL: DDeiFuncData | null = new DDeiFuncData("tooltip-show", 1, (operateType, data, ddInstance, evt)=>{ this.showTooltip(operateType, data, ddInstance, evt) }); - EVENT_MOUSE_OPERATING: DDeiFuncData | null = new DDeiFuncData("tooltip-hidden", 1, this.mouseOperating); + EVENT_MOUSE_MOVE_IN_LAYER: DDeiFuncData | null = new DDeiFuncData("tooltip-hidden", 1, this.mouseOperating); EVENT_CLOSE_FILE_AFTER: DDeiFuncData | null = new DDeiFuncData("tooltip-close", 1, this.mouseOperating); diff --git a/src/editor/MenuDialog.vue b/src/editor/MenuDialog.vue index 8c16678..43baa84 100644 --- a/src/editor/MenuDialog.vue +++ b/src/editor/MenuDialog.vue @@ -9,10 +9,10 @@
- {{ menu.label }} + {{ editor.i18n(menu.label) }}
- {{ menu.desc }} + {{ editor.i18n(menu.desc) }}
diff --git a/src/editor/grouputil.ts b/src/editor/grouputil.ts index 45f283a..dcbad20 100644 --- a/src/editor/grouputil.ts +++ b/src/editor/grouputil.ts @@ -98,6 +98,7 @@ const loadControlByFrom = function (controlOriginDefinies: Map, loadControlOthers(controlOriginDefinies, control) if (fromMenus) { + if (!control.menus) { control.menus = {}; } @@ -109,6 +110,7 @@ const loadControlByFrom = function (controlOriginDefinies: Map, } control.menus = fromMenus + control.attrDefineMap = new Map() if (!control.type && control.type != fromControl.type) { control.type = fromControl.type