From 720fdc9ca365318d3d522f6ac3b9f365eb829187 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 8 Apr 2025 00:21:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0xpack=E5=8F=8A?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=88=9B=E5=BB=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/DbToolbar.vue    | 19 +++++++++++--------
 core/core-frontend/src/utils/canvasUtils.ts   | 10 ++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index b011e6a35f..d7ffcb4e86 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -272,15 +272,18 @@ const saveResource = (checkParams?) => {
             url
           )
         }
-
         if (appData.value) {
-          initCanvasData(dvInfo.value.id, { busiFlag: 'dashboard' }, () => {
-            useEmitt().emitter.emit('refresh-dataset-selector')
-            useEmitt().emitter.emit('calcData-all')
-            resourceAppOpt.value.close()
-            dvMainStore.setAppDataInfo(null)
-            snapshotStore.resetSnapshot()
-          })
+          initCanvasData(
+            dvInfo.value.id,
+            { busiFlag: 'dashboard', resourceTable: 'snapshot' },
+            () => {
+              useEmitt().emitter.emit('refresh-dataset-selector')
+              useEmitt().emitter.emit('calcData-all')
+              resourceAppOpt.value.close()
+              dvMainStore.setAppDataInfo(null)
+              snapshotStore.resetSnapshot()
+            }
+          )
         }
         if (checkParams.withPublish) {
           publishStatusChange(checkParams.status)
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index d6dd3dd8f2..1fe7a2a556 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -243,7 +243,7 @@ export function historyAdaptor(
   canvasVersion
 ) {
   // 防止出现主画布canvasId 不一致情况
-  if (attachInfo.resourceTable === 'snapshot') {
+  if (attachInfo?.resourceTable === 'snapshot') {
     canvasDataResult.forEach(componentItem => {
       componentItem.canvasId = 'canvas-main'
     })
@@ -912,7 +912,13 @@ export async function decompressionPre(params, callBack) {
     .catch(e => {
       console.error(e)
     })
-  historyAdaptor(deTemplateData.canvasStyleData, deTemplateData.componentData, null, null, null)
+  historyAdaptor(
+    deTemplateData.canvasStyleData,
+    deTemplateData.componentData,
+    null,
+    { resourceTable: 'snapshot' },
+    null
+  )
   callBack(deTemplateData)
 }