Pre Merge pull request !252 from 陈晨成/master-fetch-dev

Merge pull request !278 from linjy/fix-perfGain

src/utils/utils.ts

@@ -286,8 +286,7 @@ export const JSONStringify = <T>(data: T) => {
         return null
       }
       return val
-    },
-    2
+    }
   )
 }
 

src/views/chart/ContentConfigurations/components/ChartData/index.vue

@@ -46,8 +46,8 @@ const selectOptions: SelectCreateDataType[] = [
 // 无数据源
 const isNotData = computed(() => {
   return (
-    targetData.value.chartConfig?.chartFrame === ChartFrameEnum.STATIC ||
-    typeof targetData.value?.option?.dataset === 'undefined'
+    targetData.value.chartConfig?.chartFrame === ChartFrameEnum.STATIC &&
+    !targetData.value?.option?.hasOwnProperty('dataset')
   )
 })
 </script>

src/views/chart/ContentHeader/headerRightBtn/index.vue

@@ -166,7 +166,7 @@ const btnList = [
   },
   {
     key: 'preview',
-    title: () => '预览',
+    title: () => '本地预览',
     type: () => 'default',
     icon: renderIcon(BrowsersOutlineIcon),
     event: previewHandle

src/views/chart/hooks/useSync.hook.ts

@@ -2,7 +2,11 @@ import { onUnmounted } from 'vue';
 import html2canvas from 'html2canvas'
 import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile, JSONStringify, JSONParse } from '@/utils'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { EditCanvasTypeEnum, ChartEditStoreEnum, ProjectInfoEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { EditCanvasTypeEnum,
+  ChartEditStoreEnum, ProjectInfoEnum,
+  ChartEditStorage,
+  EditCanvasConfigEnum
+} from '@/store/modules/chartEditStore/chartEditStore.d'
 import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
 import { StylesSetting } from '@/components/Pages/ChartItemSetting'
 import { useSystemStore } from '@/store/modules/systemStore/systemStore'
@@ -120,6 +124,20 @@ export const useSync = () => {
     // 画布补丁处理
     projectData.editCanvasConfig = canvasVersionUpdatePolyfill(projectData.editCanvasConfig)
 
+    if (projectData.editCanvasConfig[EditCanvasConfigEnum.WIDTH]) {
+      chartEditStore.setEditCanvasConfig(
+        EditCanvasConfigEnum.WIDTH,
+        projectData.editCanvasConfig[EditCanvasConfigEnum.WIDTH]
+      )
+    }
+
+    if (projectData.editCanvasConfig[EditCanvasConfigEnum.HEIGHT]) {
+      chartEditStore.setEditCanvasConfig(
+        EditCanvasConfigEnum.HEIGHT,
+        projectData.editCanvasConfig[EditCanvasConfigEnum.HEIGHT]
+      )
+    }
+    chartEditStore.computedScale()
     // 列表组件注册
     projectData.componentList.forEach(async (e: CreateComponentType | CreateComponentGroupType) => {
       const intComponent = (target: CreateComponentType) => {

src/views/project/items/components/ProjectItemsCard/index.vue

@@ -122,7 +122,8 @@ const selectOptions = ref([
   {
     label: renderLang('global.r_preview'),
     key: 'preview',
-    icon: renderIcon(BrowsersOutlineIcon)
+    icon: renderIcon(BrowsersOutlineIcon),
+    show: props.cardData?.release
   },
   {
     label: props.cardData?.release
@@ -136,7 +137,7 @@ const selectOptions = ref([
     key: 'delete',
     icon: renderIcon(TrashIcon)
   }
-])
+].filter(item => item.show !== false))
 
 const handleSelect = (key: string) => {
   switch (key) {