Pre Merge pull request !220 from Grapelllar/dev

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 ||
+    targetData.value.chartConfig?.chartFrame === ChartFrameEnum.STATIC &&
-    typeof targetData.value?.option?.dataset === 'undefined'
+    !targetData.value?.option?.hasOwnProperty('dataset')
   )
 })
 </script>

src/views/chart/ContentEdit/index.vue

@@ -196,7 +196,7 @@ onMounted(() => {
 })
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 @include goId('chart-edit-layout') {
   position: relative;
   width: 100%;

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

@@ -1,6 +1,10 @@
 import { getUUID } from '@/utils'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { ChartEditStoreEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
+import {
+  ChartEditStoreEnum,
+  ChartEditStorage,
+  EditCanvasConfigEnum
+} from '@/store/modules/chartEditStore/chartEditStore.d'
 import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
 import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore'
 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
@@ -107,6 +111,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) => {