From cd35f3629dddc6a24c4fab5dabd8408c111daeee Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 18 Apr 2024 15:54:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/DatasetUnion.vue  | 14 ++++++++++----
 .../views/visualized/data/dataset/form/index.vue   | 13 ++++++-------
 2 files changed, 16 insertions(+), 11 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 640471c702..3c91cce418 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
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { reactive, computed, ref, nextTick, inject, type Ref, watch } from 'vue'
+import { reactive, computed, ref, nextTick, inject, type Ref, watch, unref } from 'vue'
 import AddSql from './AddSql.vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import zeroNodeImg from '@/assets/img/drag.png'
@@ -113,14 +113,14 @@ const dfsForDsId = (arr, datasourceId) => {
     if (arr.children?.length) {
       return dfsForDsId(arr.children, datasourceId)
     }
-    return ele.datasourceId === datasourceId
+    return ele.datasourceId === datasourceId || !ele.datasourceId
   })
 }
 
 const crossDatasources = computed(() => {
   const { datasourceId, children = [] } = state.nodeList[0] || {}
   if (datasourceId && !!children.length) {
-    return dfsForDsId(children, datasourceId)
+    return !dfsForDsId(children, datasourceId)
   }
   return false
 })
@@ -251,6 +251,8 @@ const changeNodeFields = val => {
 }
 
 const closeEditUnion = () => {
+  nodeField.value = []
+  currentNode.value = null
   const [fir] = state.nodeList
   if (fir.isShadow) {
     delete fir.isShadow
@@ -848,9 +850,13 @@ const notConfirm = () => {
   confirm()
 }
 
+const getNodeList = () => {
+  return cloneDeep(unref(state.nodeList))
+}
+
 defineExpose({
   nodeNameList,
-  nodeList: state.nodeList,
+  getNodeList,
   setStateBack,
   notConfirm,
   dfsNodeFieldBack,
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 8896efcf36..56c66600b4 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
@@ -318,7 +318,7 @@ watch(searchTable, val => {
 const editeSave = () => {
   const union = []
   loading.value = true
-  dfsNodeList(union, datasetDrag.value.nodeList)
+  dfsNodeList(union, datasetDrag.value.getNodeList())
   saveDatasetTree({
     ...nodeInfo,
     name: datasetName.value,
@@ -448,7 +448,7 @@ const deleteField = item => {
     callback: (action: Action) => {
       if (action === 'confirm') {
         delFieldById([item.id])
-        datasetDrag.value.dfsNodeFieldBack(datasetDrag.value.nodeList, item)
+        datasetDrag.value.dfsNodeFieldBack(datasetDrag.value.getNodeList(), item)
         ElMessage({
           message: t('chart.delete_success'),
           type: 'success'
@@ -671,7 +671,6 @@ const addComplete = () => {
 const state = reactive({
   nodeNameList: [],
   editArr: [],
-  nodeList: [],
   dataSourceList: [],
   tableData: [],
   fieldCollapse: ['dimension', 'quota']
@@ -750,7 +749,7 @@ const fieldUnion = ref()
 
 const setFieldAll = () => {
   const arr = []
-  dfsFields(arr, datasetDrag.value.nodeList)
+  dfsFields(arr, datasetDrag.value.getNodeList())
   const delIdArr = getDelIdArr(arr, allfields.value)
   allfields.value = diffArr(arr, allfields.value)
   delFieldById(delIdArr)
@@ -924,7 +923,7 @@ const resetAllfieldsId = arr => {
 
 const resetAllfieldsUnionId = (arr, idMap) => {
   let strUnion = JSON.stringify(arr) as string
-  let strNodeList = JSON.stringify(toRaw(datasetDrag.value.nodeList)) as string
+  let strNodeList = JSON.stringify(toRaw(datasetDrag.value.getNodeList())) as string
   let strAllfields = JSON.stringify(unref(allfields.value)) as string
   Object.entries(idMap).forEach(([key, value]) => {
     strUnion = strUnion.replaceAll(key, value as string)
@@ -942,7 +941,7 @@ const datasetSave = () => {
     return
   }
   let union = []
-  dfsNodeList(union, datasetDrag.value.nodeList)
+  dfsNodeList(union, datasetDrag.value.getNodeList())
   const pid = route.query.pid || nodeInfo.pid
   if (!union.length) {
     ElMessage.error('数据集不能为空')
@@ -969,7 +968,7 @@ const datasetPreviewLoading = ref(false)
 const datasetPreview = () => {
   if (datasetPreviewLoading.value) return
   const arr = []
-  dfsNodeList(arr, datasetDrag.value.nodeList)
+  dfsNodeList(arr, datasetDrag.value.getNodeList())
   datasetPreviewLoading.value = true
   getPreviewData({ union: arr, allFields: allfields.value })
     .then(res => {