From d145101de82dfe74a0e62dd528787e980972452b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sun, 24 Nov 2024 19:56:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasUtils.ts            | 6 ++++--
 core/core-frontend/src/views/common/DeResourceTree.vue | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 90a7aa09c9..61bee74eff 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -227,7 +227,7 @@ export function historyAdaptor(
   canvasVersion
 ) {
   const curVersion = wsCache.get('x-de-execute-version')
-  if (canvasInfo['checkVersion'] === curVersion) {
+  if (canvasInfo?.checkVersion === curVersion) {
     return
   }
   //历史字段适配
@@ -262,7 +262,9 @@ export function historyAdaptor(
   canvasDataResult.forEach(componentItem => {
     historyItemAdaptor(componentItem, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
   })
-  updateCheckVersion(canvasInfo.id)
+  if (canvasInfo && canvasInfo.id) {
+    updateCheckVersion(canvasInfo.id)
+  }
 }
 
 // 重置仪表板、大屏中的其他组件
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 7b20501607..71ae493611 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -46,6 +46,7 @@ import { useCache } from '@/hooks/web/useCache'
 import { findParentIdByChildIdRecursive } from '@/utils/canvasUtils'
 import { XpackComponent } from '@/components/plugin'
 import treeSort from '@/utils/treeSortUtils'
+import router from '@/router'
 const { wsCache } = useCache()
 
 const dvMainStore = dvMainStoreWithOut()
@@ -186,11 +187,14 @@ const menuList = computed(() => {
 })
 
 const infoId = wsCache.get(curCanvasType.value === 'dashboard' ? 'db-info-id' : 'dv-info-id')
-const dvId = embeddedStore.dvId || infoId
+const routerDvId = router.currentRoute.value.query.dvId
+const dvId = embeddedStore.dvId || infoId || routerDvId
 wsCache.delete(curCanvasType.value === 'dashboard' ? 'db-info-id' : 'dv-info-id')
+console.log('==test===0' + selectedNodeKey.value)
 if (dvId && showPosition.value === 'preview') {
   selectedNodeKey.value = dvId
   returnMounted.value = true
+  console.log('==test==1=' + selectedNodeKey.value)
 }
 const nodeExpand = data => {
   if (data.id) {
@@ -270,6 +274,7 @@ const afterTreeInit = () => {
     returnMounted.value = false
   }
   nextTick(() => {
+    console.log('==test==2=' + selectedNodeKey.value)
     resourceListTree.value.setCurrentKey(selectedNodeKey.value)
     nextTick(() => {
       if (selectedNodeKey.value) {