From f22f4cb164a5933c6bbe15f9d6c99b2bcd0b8596 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 10 Nov 2023 14:00:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/DatasetUnion.vue     |  2 +-
 .../src/views/visualized/data/dataset/form/index.vue  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 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 3383c6da2f..01560b78f9 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
@@ -410,7 +410,7 @@ const flatPathList = computed(() => {
   return flatArr
 })
 
-const dfsNode = (arr, nodeListLocation, x = 0, y = 0) => {
+const dfsNode = (arr = [], nodeListLocation, x = 0, y = 0) => {
   arr.map((ele, index) => {
     const pre = nodeListLocation[index - 1]
     if (!ele.children?.length) {
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 a01ae02d78..fee64c947e 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
@@ -1,6 +1,7 @@
 <script lang="tsx" setup>
 import {
   ref,
+  toRaw,
   unref,
   nextTick,
   reactive,
@@ -881,6 +882,7 @@ const resetAllfieldsId = arr => {
     const id = guid()
     idMap[allfields.value[i].id] = id
     allfields.value[i].id = id
+    allfields.value[i].datasetGroupId = ''
   }
   resetDfsFields(arr, idMap)
   return idMap
@@ -888,12 +890,15 @@ 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 strAllfields = JSON.stringify(unref(allfields.value)) as string
   Object.entries(idMap).forEach(([key, value]) => {
     strUnion = strUnion.replace(key, value as string)
     strAllfields = strAllfields.replace(key, value as string)
+    strNodeList = strNodeList.replace(key, value as string)
   })
   allfields.value = JSON.parse(strAllfields)
+  datasetDrag.value.initState(JSON.parse(strNodeList))
   return JSON.parse(strUnion)
 }
 
@@ -1023,11 +1028,6 @@ const cascaderChangeArr = val => {
   const [deType, dateFormat] = val
   dimensionsSelection.value = dimensionsTable.value.getSelectionRows().map(ele => ele.id)
   quotaSelection.value = quotaTable.value.getSelectionRows().map(ele => ele.id)
-  console.log(
-    'dimensionsSelection.value',
-    [...dimensionsSelection.value],
-    [...quotaSelection.value]
-  )
 
   const arr = [...quotaSelection.value, ...dimensionsSelection.value]
   if (dateFormat === 'custom') {
@@ -1122,6 +1122,7 @@ const finish = res => {
     pid,
     name
   }
+  allfields.value = res.allFields || []
 }
 
 const errorTips = ref('')