Merge branch 'ft' into 'main'

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

See merge request yunteng/thingskit-view!5

@@ -5,7 +5,7 @@ import cloneDeep from 'lodash/cloneDeep'
 
 
 export const option = {
 export const option = {
   dataset: '物联网平台数据统计',
   dataset: '物联网平台数据统计',
-  bgSrc: 'src/assets/images/chart/headbackground/bg_top.png',
+  bgSrc: 'src/assets/external/headbackground/bg_top.png',
   fontSize: 36,
   fontSize: 36,
   showRight:true,
   showRight:true,
   textColor:'#00f6ff',
   textColor:'#00f6ff',

@@ -83,7 +83,7 @@ onMounted(() => {
           "4": '星期四',
           "4": '星期四',
           "5": '星期五',
           "5": '星期五',
           "6": '星期六',
           "6": '星期六',
-        }
+        } as any
     const datetime = new Date()
     const datetime = new Date()
     const year = datetime.getFullYear()
     const year = datetime.getFullYear()
     const month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1
     const month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1
@@ -131,7 +131,7 @@ onUnmounted(() => {
 }
 }
 
 
 .go-n-grid {
 .go-n-grid {
-  background: url(@/assets/images/chart/headbackground/bg_top.png) center no-repeat;
+  background: url(@/assets/external/headbackground/bg_top.png) center no-repeat;
   background-size: 100% 100%;
   background-size: 100% 100%;
   text-align: center;
   text-align: center;
   font-size: 36px;
   font-size: 36px;

@@ -15,7 +15,7 @@ import {
   HistoryItemType,
   HistoryItemType,
   HistoryTargetTypeEnum
   HistoryTargetTypeEnum
 } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
 } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
-import { MenuEnum } from '@/enums/editPageEnum'
+import { MenuEnum,SyncEnum } from '@/enums/editPageEnum'
 import { getUUID, loadingStart, loadingFinish, loadingError, isString, isArray } from '@/utils'
 import { getUUID, loadingStart, loadingFinish, loadingError, isString, isArray } from '@/utils'
 import {
 import {
   ProjectInfoType,
   ProjectInfoType,
@@ -48,7 +48,7 @@ export const useChartEditStore = defineStore({
       // THINGS_KIT
       // THINGS_KIT
       //保存缩图需要的组织id
       //保存缩图需要的组织id
       organizationId: '',
       organizationId: '',
-      state: 0,
+      state: 0
     },
     },
     // 画布属性
     // 画布属性
     editCanvas: {
     editCanvas: {
@@ -68,7 +68,10 @@ export const useChartEditStore = defineStore({
       // 拖拽中
       // 拖拽中
       isDrag: false,
       isDrag: false,
       // 框选中
       // 框选中
-      isSelect: false
+      isSelect: false,
+      // THINGS_KIT
+      // 同步中
+      saveStatus: SyncEnum.PENDING
     },
     },
     // 右键菜单
     // 右键菜单
     rightMenuShow: false,
     rightMenuShow: false,

@@ -8,13 +8,7 @@ import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore'
 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
 // 图标
 // 图标
 const { BarChartIcon } = icon.ionicons5
 const { BarChartIcon } = icon.ionicons5
-const {
-  TableSplitIcon,
-  RoadmapIcon,
-  SpellCheckIcon,
-  GraphicalDataFlowIcon,
-} = icon.carbon
-
+const { TableSplitIcon, RoadmapIcon, SpellCheckIcon, GraphicalDataFlowIcon } = icon.carbon
 
 
 // 图表
 // 图表
 export type MenuOptionsType = {
 export type MenuOptionsType = {
@@ -26,32 +20,28 @@ export type MenuOptionsType = {
 
 
 const { getPackagesList } = usePackagesStore()
 const { getPackagesList } = usePackagesStore()
 const menuOptions: MenuOptionsType[] = []
 const menuOptions: MenuOptionsType[] = []
-
+// THINGS_KIT
 const packagesListObj = {
 const packagesListObj = {
   [PackagesCategoryEnum.CHARTS]: {
   [PackagesCategoryEnum.CHARTS]: {
     icon: renderIcon(RoadmapIcon),
     icon: renderIcon(RoadmapIcon),
-    label: PackagesCategoryName.CHARTS,
+    label: PackagesCategoryName.CHARTS
   },
   },
   [PackagesCategoryEnum.INFORMATIONS]: {
   [PackagesCategoryEnum.INFORMATIONS]: {
     icon: renderIcon(SpellCheckIcon),
     icon: renderIcon(SpellCheckIcon),
-    label: PackagesCategoryName.INFORMATIONS,
+    label: PackagesCategoryName.INFORMATIONS
   },
   },
   [PackagesCategoryEnum.TABLES]: {
   [PackagesCategoryEnum.TABLES]: {
     icon: renderIcon(TableSplitIcon),
     icon: renderIcon(TableSplitIcon),
-    label: PackagesCategoryName.TABLES,
+    label: PackagesCategoryName.TABLES
   },
   },
   [PackagesCategoryEnum.DECORATES]: {
   [PackagesCategoryEnum.DECORATES]: {
     icon: renderIcon(GraphicalDataFlowIcon),
     icon: renderIcon(GraphicalDataFlowIcon),
-    label: PackagesCategoryName.DECORATES,
-  },
-  [PackagesCategoryEnum.ARTOONS]: {
-    icon: renderIcon(GraphicalDataFlowIcon),
-    label: PackagesCategoryName.ARTOONS,
+    label: PackagesCategoryName.DECORATES
   },
   },
   [PackagesCategoryEnum.COMPOSES]: {
   [PackagesCategoryEnum.COMPOSES]: {
     icon: renderIcon(GraphicalDataFlowIcon),
     icon: renderIcon(GraphicalDataFlowIcon),
-    label: PackagesCategoryName.COMPOSES,
-  },
+    label: PackagesCategoryName.COMPOSES
+  }
 }
 }
 
 
 // 处理列表
 // 处理列表
@@ -64,7 +54,7 @@ const handlePackagesList = () => {
       // @ts-ignore
       // @ts-ignore
       label: packagesListObj[val].label,
       label: packagesListObj[val].label,
       // @ts-ignore
       // @ts-ignore
-      list: getPackagesList[val],
+      list: getPackagesList[val]
     })
     })
   }
   }
 }
 }
@@ -89,12 +79,4 @@ const clickItemHandle = (key: string, item: any) => {
   beforeSelect = key
   beforeSelect = key
 }
 }
 
 
-export {
-  getCharts,
-  BarChartIcon,
-  themeColor,
-  selectOptions,
-  selectValue,
-  clickItemHandle,
-  menuOptions,
-}
+export { getCharts, BarChartIcon, themeColor, selectOptions, selectValue, clickItemHandle, menuOptions }

@@ -2,6 +2,7 @@ import { ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.
 
 
 export interface ChartEditStorageType extends ChartEditStorage {
 export interface ChartEditStorageType extends ChartEditStorage {
   // THINGS_KIT
   // THINGS_KIT
-  id: string
+  id: string,
+  projectName:string,
   isRelease?: boolean
   isRelease?: boolean
 }
 }