From 9f93699833e2f162c16e90906a4c6f51c87a5905 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 20 Aug 2024 14:51:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A1=80=E7=BC=98=E5=88=86=E6=9E=90):=20?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BE=9D=E8=B5=96=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/relation/index.ts                | 6 ++++++
 .../src/views/visualized/data/dataset/index.vue             | 2 +-
 .../src/views/visualized/data/datasource/index.vue          | 2 +-
 de-xpack                                                    | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/api/relation/index.ts b/core/core-frontend/src/api/relation/index.ts
index 5db9caa340..b1ad10e490 100644
--- a/core/core-frontend/src/api/relation/index.ts
+++ b/core/core-frontend/src/api/relation/index.ts
@@ -17,3 +17,9 @@ export function getPanelRelationship(id) {
     url: `/relation/dv/${id}`
   })
 }
+
+export function resourceCheckPermission(id) {
+  return request.post({
+    url: `/resource/checkPermission/${id}`
+  })
+}
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index e94b5d8338..2cc05a3857 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -260,7 +260,7 @@ const dfsDatasetTree = (ds, id) => {
 }
 
 onBeforeMount(() => {
-  nodeInfo.id = (route.params.id as string) || ''
+  nodeInfo.id = (route.params.id as string) || (route.query.id as string) || ''
   loadInit()
   getData()
 })
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index b5814612a4..274aa1bc56 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -906,7 +906,7 @@ const loadInit = () => {
 }
 
 onMounted(() => {
-  nodeInfo.id = (route.params.id as string) || ''
+  nodeInfo.id = (route.params.id as string) || (route.query.id as string) || ''
   loadInit()
   listDs()
   const { opt } = router.currentRoute.value.query
diff --git a/de-xpack b/de-xpack
index 4d6e54f478..7d33cdfc9c 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4d6e54f4788840bd4a2ed0ed25c5394855554174
+Subproject commit 7d33cdfc9cc735685e430cc5685c21608c589218