From 2928eaa4aedc65ffa48ccb8a5af07560eeea7e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Sun, 14 Aug 2022 00:20:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=B3=E9=94=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/editPageEnum.ts | 2 +- .../components/EditAlignLine/index.vue | 4 ++-- src/views/chart/hooks/useContextMenu.hook.d.ts | 15 +-------------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/enums/editPageEnum.ts b/src/enums/editPageEnum.ts index a987d59e..47b24a73 100644 --- a/src/enums/editPageEnum.ts +++ b/src/enums/editPageEnum.ts @@ -9,7 +9,7 @@ export enum DragKeyEnum { DROG_KEY = 'ChartData' } -// 右键枚举 +// 操作枚举 export enum MenuEnum { ARROW_UP = 'up', ARROW_RIGHT = 'right', diff --git a/src/views/chart/ContentEdit/components/EditAlignLine/index.vue b/src/views/chart/ContentEdit/components/EditAlignLine/index.vue index dea92fe1..4d0d43a8 100644 --- a/src/views/chart/ContentEdit/components/EditAlignLine/index.vue +++ b/src/views/chart/ContentEdit/components/EditAlignLine/index.vue @@ -16,7 +16,7 @@ import { useDesignStore } from '@/store/modules/designStore/designStore' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d' import { useSettingStore } from '@/store/modules/settingStore/settingStore' -import { CreateComponentType } from '@/packages/index.d' +import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d' import throttle from 'lodash/throttle' import cloneDeep from 'lodash/cloneDeep' // 全局颜色 @@ -111,7 +111,7 @@ watch( line.select.clear() line.sorptioned.y = false // 循环查询所有组件数据 - const componentList = chartEditStore.getComponentList.map((e: CreateComponentType) => { + const componentList = chartEditStore.getComponentList.map((e: CreateComponentType | CreateComponentGroupType) => { return { id: e.id, attr: e.attr diff --git a/src/views/chart/hooks/useContextMenu.hook.d.ts b/src/views/chart/hooks/useContextMenu.hook.d.ts index 99d5b743..ec1276c2 100644 --- a/src/views/chart/hooks/useContextMenu.hook.d.ts +++ b/src/views/chart/hooks/useContextMenu.hook.d.ts @@ -1,17 +1,4 @@ -// 右键枚举 -export enum MenuEnum { - DELETE = 'delete', - COPY = 'copy', - CUT = 'cut', - PARSE = 'parse', - TOP = 'top', - BOTTOM = 'bottom', - UP = 'up', - DOWN = 'down', - CLEAR = 'clear', - GROUP = 'group', - UN_GROUP = 'unGroup' -} +import { MenuEnum } from '@/enums/editPageEnum' export interface MenuOptionsItemType { type?: string