From 2b95be602247f3e0776f7db74c373b66a213424b Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 9 Jan 2024 10:34:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E5=90=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=90=8C=E5=90=8D=E7=9A=84=E8=A1=A8=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=81=9A=E5=85=B3=E8=81=94=EF=BC=88=E6=97=A0=E6=B3=95=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/form/DatasetUnion.vue | 4 ++--
 .../src/views/visualized/data/dataset/form/index.vue        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index 9e8514d6c5..b58fea3eb0 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -95,8 +95,8 @@ const dfsNodeList = computed(() => {
 })
 
 const dfsNodeNameList = (list, arr) => {
-  return list.forEach(ele => {
-    arr.push(ele.tableName)
+  list.forEach(ele => {
+    arr.push(`${ele.tableName}${ele.datasourceId}`)
     if (ele.children?.length) {
       dfsNodeNameList(ele.children, arr)
     }
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 161ec36d9c..053f7f58e4 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -634,7 +634,7 @@ const tabChange = val => {
 
 const addComplete = () => {
   state.nodeNameList = [...datasetDrag.value.nodeNameList]
-  if (!state.nodeNameList) {
+  if (!state.nodeNameList?.length) {
     columns.value = []
     tableData.value = []
   }
@@ -1280,14 +1280,14 @@ const getDsIconName = data => {
             <div
               :class="[
                 {
-                  'not-allow': state.nodeNameList.includes(ele.tableName)
+                  'not-allow': state.nodeNameList.includes(`${ele.tableName}${dataSource}`)
                 }
               ]"
               class="list-item_primary"
               :title="ele.name"
               @dragstart="$event => dragstart($event, ele)"
               @dragend="maskShow = false"
-              :draggable="!state.nodeNameList.includes(ele.tableName)"
+              :draggable="!state.nodeNameList.includes(`${ele.tableName}${dataSource}`)"
               @click="setActiveName(ele)"
             >
               <el-icon class="icon-color">