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

---
 .../visualized/data/dataset/form/index.vue    | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

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 0f39f2fa33..a01ae02d78 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,
+  unref,
   nextTick,
   reactive,
   shallowRef,
@@ -863,18 +864,54 @@ const getDatasource = () => {
 
 getDatasource()
 
+const resetDfsFields = (arr, idMap) => {
+  for (let i in arr) {
+    const id = guid()
+    idMap[arr[i].currentDs.id] = id
+    arr[i].currentDs.id = id
+    if (!!arr[i].childrenDs?.length) {
+      resetDfsFields(arr[i].childrenDs, idMap)
+    }
+  }
+}
+
+const resetAllfieldsId = arr => {
+  const idMap = {}
+  for (let i in allfields.value) {
+    const id = guid()
+    idMap[allfields.value[i].id] = id
+    allfields.value[i].id = id
+  }
+  resetDfsFields(arr, idMap)
+  return idMap
+}
+
+const resetAllfieldsUnionId = (arr, idMap) => {
+  let strUnion = JSON.stringify(arr) 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)
+  })
+  allfields.value = JSON.parse(strAllfields)
+  return JSON.parse(strUnion)
+}
+
 const datasetSave = () => {
   if (nodeInfo.id) {
     editeSave()
     return
   }
-  const union = []
+  let union = []
   dfsNodeList(union, datasetDrag.value.nodeList)
   const pid = route.query.pid || nodeInfo.pid
   if (!union.length) {
     ElMessage.error('数据集不能为空')
     return
   }
+  if (nodeInfo.pid && !nodeInfo.id) {
+    union = resetAllfieldsUnionId(union, resetAllfieldsId(union))
+  }
 
   creatDsFolder.value.createInit(
     'dataset',