Commit 7a540f3ac9d0e8b8fba6d3f8653a99bb2bd93777

Authored by fengwotao
1 parent 9799fad0

pref:修打包错误,TS类型错误

@@ -15,7 +15,7 @@ import { @@ -15,7 +15,7 @@ import {
15 HistoryItemType, 15 HistoryItemType,
16 HistoryTargetTypeEnum 16 HistoryTargetTypeEnum
17 } from '@/store/modules/chartHistoryStore/chartHistoryStore.d' 17 } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
18 -import { MenuEnum } from '@/enums/editPageEnum' 18 +import { MenuEnum,SyncEnum } from '@/enums/editPageEnum'
19 import { getUUID, loadingStart, loadingFinish, loadingError, isString, isArray } from '@/utils' 19 import { getUUID, loadingStart, loadingFinish, loadingError, isString, isArray } from '@/utils'
20 import { 20 import {
21 ProjectInfoType, 21 ProjectInfoType,
@@ -48,7 +48,7 @@ export const useChartEditStore = defineStore({ @@ -48,7 +48,7 @@ export const useChartEditStore = defineStore({
48 // THINGS_KIT 48 // THINGS_KIT
49 //保存缩图需要的组织id 49 //保存缩图需要的组织id
50 organizationId: '', 50 organizationId: '',
51 - state: 0, 51 + state: 0
52 }, 52 },
53 // 画布属性 53 // 画布属性
54 editCanvas: { 54 editCanvas: {
@@ -68,7 +68,10 @@ export const useChartEditStore = defineStore({ @@ -68,7 +68,10 @@ export const useChartEditStore = defineStore({
68 // 拖拽中 68 // 拖拽中
69 isDrag: false, 69 isDrag: false,
70 // 框选中 70 // 框选中
71 - isSelect: false 71 + isSelect: false,
  72 + // THINGS_KIT
  73 + // 同步中
  74 + saveStatus: SyncEnum.PENDING
72 }, 75 },
73 // 右键菜单 76 // 右键菜单
74 rightMenuShow: false, 77 rightMenuShow: false,
@@ -8,13 +8,7 @@ import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore' @@ -8,13 +8,7 @@ import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore'
8 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d' 8 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
9 // 图标 9 // 图标
10 const { BarChartIcon } = icon.ionicons5 10 const { BarChartIcon } = icon.ionicons5
11 -const {  
12 - TableSplitIcon,  
13 - RoadmapIcon,  
14 - SpellCheckIcon,  
15 - GraphicalDataFlowIcon,  
16 -} = icon.carbon  
17 - 11 +const { TableSplitIcon, RoadmapIcon, SpellCheckIcon, GraphicalDataFlowIcon } = icon.carbon
18 12
19 // 图表 13 // 图表
20 export type MenuOptionsType = { 14 export type MenuOptionsType = {
@@ -26,32 +20,28 @@ export type MenuOptionsType = { @@ -26,32 +20,28 @@ export type MenuOptionsType = {
26 20
27 const { getPackagesList } = usePackagesStore() 21 const { getPackagesList } = usePackagesStore()
28 const menuOptions: MenuOptionsType[] = [] 22 const menuOptions: MenuOptionsType[] = []
29 - 23 +// THINGS_KIT
30 const packagesListObj = { 24 const packagesListObj = {
31 [PackagesCategoryEnum.CHARTS]: { 25 [PackagesCategoryEnum.CHARTS]: {
32 icon: renderIcon(RoadmapIcon), 26 icon: renderIcon(RoadmapIcon),
33 - label: PackagesCategoryName.CHARTS, 27 + label: PackagesCategoryName.CHARTS
34 }, 28 },
35 [PackagesCategoryEnum.INFORMATIONS]: { 29 [PackagesCategoryEnum.INFORMATIONS]: {
36 icon: renderIcon(SpellCheckIcon), 30 icon: renderIcon(SpellCheckIcon),
37 - label: PackagesCategoryName.INFORMATIONS, 31 + label: PackagesCategoryName.INFORMATIONS
38 }, 32 },
39 [PackagesCategoryEnum.TABLES]: { 33 [PackagesCategoryEnum.TABLES]: {
40 icon: renderIcon(TableSplitIcon), 34 icon: renderIcon(TableSplitIcon),
41 - label: PackagesCategoryName.TABLES, 35 + label: PackagesCategoryName.TABLES
42 }, 36 },
43 [PackagesCategoryEnum.DECORATES]: { 37 [PackagesCategoryEnum.DECORATES]: {
44 icon: renderIcon(GraphicalDataFlowIcon), 38 icon: renderIcon(GraphicalDataFlowIcon),
45 - label: PackagesCategoryName.DECORATES,  
46 - },  
47 - [PackagesCategoryEnum.ARTOONS]: {  
48 - icon: renderIcon(GraphicalDataFlowIcon),  
49 - label: PackagesCategoryName.ARTOONS, 39 + label: PackagesCategoryName.DECORATES
50 }, 40 },
51 [PackagesCategoryEnum.COMPOSES]: { 41 [PackagesCategoryEnum.COMPOSES]: {
52 icon: renderIcon(GraphicalDataFlowIcon), 42 icon: renderIcon(GraphicalDataFlowIcon),
53 - label: PackagesCategoryName.COMPOSES,  
54 - }, 43 + label: PackagesCategoryName.COMPOSES
  44 + }
55 } 45 }
56 46
57 // 处理列表 47 // 处理列表
@@ -64,7 +54,7 @@ const handlePackagesList = () => { @@ -64,7 +54,7 @@ const handlePackagesList = () => {
64 // @ts-ignore 54 // @ts-ignore
65 label: packagesListObj[val].label, 55 label: packagesListObj[val].label,
66 // @ts-ignore 56 // @ts-ignore
67 - list: getPackagesList[val], 57 + list: getPackagesList[val]
68 }) 58 })
69 } 59 }
70 } 60 }
@@ -89,12 +79,4 @@ const clickItemHandle = (key: string, item: any) => { @@ -89,12 +79,4 @@ const clickItemHandle = (key: string, item: any) => {
89 beforeSelect = key 79 beforeSelect = key
90 } 80 }
91 81
92 -export {  
93 - getCharts,  
94 - BarChartIcon,  
95 - themeColor,  
96 - selectOptions,  
97 - selectValue,  
98 - clickItemHandle,  
99 - menuOptions,  
100 -} 82 +export { getCharts, BarChartIcon, themeColor, selectOptions, selectValue, clickItemHandle, menuOptions }
@@ -2,6 +2,7 @@ import { ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore. @@ -2,6 +2,7 @@ import { ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.
2 2
3 export interface ChartEditStorageType extends ChartEditStorage { 3 export interface ChartEditStorageType extends ChartEditStorage {
4 // THINGS_KIT 4 // THINGS_KIT
5 - id: string 5 + id: string,
  6 + projectName:string,
6 isRelease?: boolean 7 isRelease?: boolean
7 } 8 }