From a4d797895387872e68fdc35df0e2a3a8c53141e8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 15:43:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=A4=A7=E5=B1=8F=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=90=8E=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=BD=AE=E6=9C=89?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasUtils.ts          |  2 +-
 .../src/views/data-visualization/index.vue           | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index a59498aa2f..d1ff7e2468 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -152,7 +152,7 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) {
   })
 }
 
-export function initCanvasData(dvId, busiFlag, callBack) {
+export async function initCanvasData(dvId, busiFlag, callBack) {
   initCanvasDataPrepare(
     dvId,
     busiFlag,
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index fc3775cbda..2f58c0be5f 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -79,7 +79,7 @@ const dvLayout = ref(null)
 const canvasCenterRef = ref(null)
 const state = reactive({
   datasetTree: [],
-  scaleHistory: 100,
+  scaleHistory: null,
   canvasId: 'canvas-main',
   canvasInitStatus: false,
   sourcePid: null,
@@ -204,10 +204,10 @@ const doUseCache = flag => {
   }
 }
 
-const initLocalCanvasData = () => {
+const initLocalCanvasData = async () => {
   const { opt, sourcePid, resourceId } = state
   const busiFlg = opt === 'copy' ? 'dataV-copy' : 'dataV'
-  initCanvasData(resourceId, busiFlg, function () {
+  await initCanvasData(resourceId, busiFlg, function () {
     state.canvasInitStatus = true
     // afterInit
     nextTick(() => {
@@ -238,7 +238,9 @@ watch(
   () => editMode.value,
   val => {
     if (val === 'edit') {
-      canvasStyleData.value.scale = state.scaleHistory
+      if (state.scaleHistory) {
+        canvasStyleData.value.scale = state.scaleHistory
+      }
       initScroll()
     } else {
       previewScaleChange()
@@ -288,7 +290,7 @@ onMounted(async () => {
     if (canvasCache) {
       canvasCacheOutRef.value?.dialogInit({ canvasType: 'dataV', resourceId: dvId })
     } else {
-      initLocalCanvasData()
+      await initLocalCanvasData()
     }
   } else if (opt && opt === 'create') {
     state.canvasInitStatus = false