From b3229bd93d89560c6a2ea32e77f248df94fc0da1 Mon Sep 17 00:00:00 2001 From: linjy Date: Tue, 26 May 2026 17:39:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=9B2=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=94=BB=E5=B8=83=E5=B1=95=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ChartData/index.vue | 4 ++-- src/views/chart/hooks/useSync.hook.ts | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/index.vue index a869a396..a0009b57 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/index.vue +++ b/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') ) }) diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts index 0d27fc99..410c16d7 100644 --- a/src/views/chart/hooks/useSync.hook.ts +++ b/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) => {