diff --git a/package-lock.json b/package-lock.json index eb53e1e7..f2b1dcbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "svg-pathdata": "^6.0.0", "tinycolor2": "^1.4.2", "vue": "^3.2.37", - "vuedraggable": "^4.0.1" + "vuedraggable": "^4.1.0" }, "devDependencies": { "@commitlint/cli": "^12.0.0", diff --git a/package.json b/package.json index f3684174..08e213cd 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "svg-pathdata": "^6.0.0", "tinycolor2": "^1.4.2", "vue": "^3.2.37", - "vuedraggable": "^4.0.1" + "vuedraggable": "^4.1.0" }, "devDependencies": { "@commitlint/cli": "^12.0.0", diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index 74e304d7..cdbabe6b 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -48,6 +48,7 @@ import { Tailoring, Effects, ColorFilter, + Up, Down, Plus, Minus, @@ -159,6 +160,7 @@ export const icons = { IconTailoring: Tailoring, IconEffects: Effects, IconColorFilter: ColorFilter, + IconUp: Up, IconDown: Down, IconPlus: Plus, IconMinus: Minus, diff --git a/src/views/Editor/Canvas/index.vue b/src/views/Editor/Canvas/index.vue index d838c04a..bcd54d07 100644 --- a/src/views/Editor/Canvas/index.vue +++ b/src/views/Editor/Canvas/index.vue @@ -143,6 +143,7 @@ const { editorAreaFocus, gridLineSize, showRuler, + showSelectPanel, creatingElement, canvasScale, textFormatPainter, @@ -287,6 +288,13 @@ const contextmenus = (): ContextmenuItem[] => { }, ], }, + { + text: showSelectPanel.value ? '关闭选择面板' : '打开选择面板', + handler: () => { + if (!showSelectPanel.value) mainStore.setSelectPanelState(true) + else mainStore.setSelectPanelState(false) + }, + }, { text: '重置当前页', handler: deleteAllElements, diff --git a/src/views/Editor/EditorHeader/index.vue b/src/views/Editor/EditorHeader/index.vue index 737fe63f..e23f127e 100644 --- a/src/views/Editor/EditorHeader/index.vue +++ b/src/views/Editor/EditorHeader/index.vue @@ -27,7 +27,7 @@ {{ gridLineSize ? '关闭网格线' : '打开网格线' }} {{ showRuler ? '关闭标尺' : '打开标尺' }} 重置幻灯片 - 打开选择面板 + {{ showSelectPanel ? '关闭选择面板' : '打开选择面板' }} @@ -91,7 +91,7 @@ import useExport from '@/hooks/useExport' import HotkeyDoc from './HotkeyDoc.vue' const mainStore = useMainStore() -const { gridLineSize, showRuler } = storeToRefs(mainStore) +const { gridLineSize, showRuler, showSelectPanel } = storeToRefs(mainStore) const { enterScreening, enterScreeningFromStart } = useScreening() const { createSlide, deleteSlide, resetSlides } = useSlideHandler() @@ -109,7 +109,8 @@ const toggleRuler = () => { } const openSelectPanel = () => { - mainStore.setSelectPanelState(true) + if (!showSelectPanel.value) mainStore.setSelectPanelState(true) + else mainStore.setSelectPanelState(false) } const hotkeyDrawerVisible = ref(false) diff --git a/src/views/Editor/SelectPanel.vue b/src/views/Editor/SelectPanel.vue index 1fb0135e..93a0484a 100644 --- a/src/views/Editor/SelectPanel.vue +++ b/src/views/Editor/SelectPanel.vue @@ -8,9 +8,15 @@ :top="90" @close="close()" > -
- - +
+
+ + +
+
+ + +