diff --git a/src/components/Contextmenu/ContextmenuContent.vue b/src/components/Contextmenu/ContextmenuContent.vue index 35642d16..4e5fc636 100644 --- a/src/components/Contextmenu/ContextmenuContent.vue +++ b/src/components/Contextmenu/ContextmenuContent.vue @@ -9,11 +9,7 @@ :class="{'divider': menu.divider, 'disable': menu.disable}" >
- - -
- {{menu.text}} -
+ {{menu.text}} {{menu.subText}} , @@ -126,22 +117,8 @@ $subMenuWidth: 120px; top: 50%; transform: translateY(-50%); } - - .icon { - margin-right: 7px; - vertical-align: middle; - } - .text span { - vertical-align: middle; - } - .icon-placehoder { - display: inline-block; - width: 12px; - height: 12px; - margin-right: 7px; - } .sub-text { - opacity: 0.3; + opacity: 0.6; } .sub-menu { position: absolute; diff --git a/src/components/Contextmenu/types.ts b/src/components/Contextmenu/types.ts index ce6cd031..2f91e35a 100644 --- a/src/components/Contextmenu/types.ts +++ b/src/components/Contextmenu/types.ts @@ -1,11 +1,9 @@ export interface ContextmenuItem { text?: string; subText?: string; - icon?: string; divider?: boolean; disable?: boolean; hide?: boolean; - iconPlacehoder?: boolean; children?: ContextmenuItem[]; handler?: (el: HTMLElement) => void; } diff --git a/src/views/Editor/Thumbnails/index.vue b/src/views/Editor/Thumbnails/index.vue index e6116b65..46b011b8 100644 --- a/src/views/Editor/Thumbnails/index.vue +++ b/src/views/Editor/Thumbnails/index.vue @@ -95,37 +95,31 @@ export default defineComponent({ { text: '剪切', subText: 'Ctrl + X', - icon: 'icon-scissor', handler: cutSlide, }, { text: '复制', subText: 'Ctrl + C', - icon: 'icon-copy', handler: copySlide, }, { text: '粘贴', subText: 'Ctrl + V', - icon: 'icon-paste', handler: pasteSlide, }, { divider: true }, { text: '新建页面', subText: 'Enter', - icon: 'icon-add-page', handler: createSlide, }, { text: '复制页面', - icon: 'icon-copy', handler: copyAndPasteSlide, }, { text: '删除页面', subText: 'Delete', - icon: 'icon-delete', handler: deleteSlide, }, ] diff --git a/src/views/_common/_element/EditableElement.vue b/src/views/_common/_element/EditableElement.vue index 6fe10f1f..6363ec2a 100644 --- a/src/views/_common/_element/EditableElement.vue +++ b/src/views/_common/_element/EditableElement.vue @@ -108,7 +108,6 @@ export default defineComponent({ if(props.elementInfo.lock) { return [{ text: '解锁', - icon: 'icon-unlock', handler: () => unlockElement(props.elementInfo), }] } @@ -117,19 +116,16 @@ export default defineComponent({ { text: '剪切', subText: 'Ctrl + X', - icon: 'icon-scissor', handler: cutElement, }, { text: '复制', subText: 'Ctrl + C', - icon: 'icon-copy', handler: copyElement, }, { divider: true }, { text: '层级排序', - icon: 'icon-top-layer', disable: props.isMultiSelect && !props.elementInfo.groupId, children: [ { text: '置顶层', handler: () => orderElement(props.elementInfo, ElementOrderCommands.TOP) }, @@ -141,7 +137,6 @@ export default defineComponent({ }, { text: '水平对齐', - icon: 'icon-align-left', children: [ { text: '水平居中', handler: () => alignElementToCanvas(ElementAlignCommands.HORIZONTAL) }, { text: '左对齐', handler: () => alignElementToCanvas(ElementAlignCommands.LEFT) }, @@ -150,7 +145,6 @@ export default defineComponent({ }, { text: '垂直对齐', - icon: 'icon-align-bottom', children: [ { text: '垂直居中', handler: () => alignElementToCanvas(ElementAlignCommands.VERTICAL) }, { text: '上对齐', handler: () => alignElementToCanvas(ElementAlignCommands.TOP) }, @@ -161,20 +155,17 @@ export default defineComponent({ { text: props.elementInfo.groupId ? '取消组合' : '组合', subText: 'Ctrl + G', - icon: 'icon-block', handler: props.elementInfo.groupId ? uncombineElements : combineElements, hide: !props.isMultiSelect, }, { text: '锁定', subText: 'Ctrl + L', - icon: 'icon-lock', handler: lockElement, }, { text: '删除', subText: 'Delete', - icon: 'icon-delete', handler: deleteElement, }, ]