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