From 8c3d66eb3c1397fc4372f568f0f847cdd624bac0 Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Wed, 27 Sep 2023 13:38:15 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E5=88=9B=E5=BB=BA=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E3=80=81=E5=A4=8D=E5=88=B6=E8=8A=82=E7=82=B9=E6=97=B6?=
 =?UTF-8?q?=E7=BB=99=E6=96=B0=E8=8A=82=E7=82=B9=E6=95=B0=E6=8D=AE=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BAuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple-mind-map/src/core/render/Render.js | 23 +++++++++++++++--------
 simple-mind-map/src/utils/index.js        |  6 ++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js
index 8ec946ce..5f53134e 100644
--- a/simple-mind-map/src/core/render/Render.js
+++ b/simple-mind-map/src/core/render/Render.js
@@ -18,7 +18,8 @@ import {
   addDataToAppointNodes,
   createUidForAppointNodes,
   formatDataToArray,
-  getNodeIndex
+  getNodeIndex,
+  createUid
 } from '../../utils'
 import { shapeList } from './node/Shape'
 import { lineStyleProps } from '../../themes/default'
@@ -494,15 +495,17 @@ class Render {
       const index = parent.nodeData.children.findIndex(item => {
         return item.data.uid === node.uid
       })
-      parent.nodeData.children.splice(index + 1, 0, {
+      const newNodeData = {
         inserting: handleMultiNodes ? false : openEdit, // 如果同时对多个节点插入子节点，那么无需进入编辑模式,
         data: {
           text: text,
           ...params,
+          uid: createUid(),
           ...(appointData || {})
         },
-        children: [...appointChildren]
-      })
+        children: [...createUidForAppointNodes(appointChildren)]
+      }
+      parent.nodeData.children.splice(index + 1, 0, newNodeData)
     })
     Object.keys(needDestroyNodeList).forEach(key => {
       needDestroyNodeList[key].destroy()
@@ -546,10 +549,11 @@ class Render {
       const index = parent.nodeData.children.findIndex(item => {
         return item.data.uid === node.uid
       })
+      const newNodeList = createUidForAppointNodes(simpleDeepClone(nodeList))
       parent.nodeData.children.splice(
         index + 1,
         0,
-        ...createUidForAppointNodes(simpleDeepClone(nodeList))
+        ...newNodeList
       )
     })
     Object.keys(needDestroyNodeList).forEach(key => {
@@ -598,15 +602,17 @@ class Render {
       const text = node.isRoot
         ? defaultInsertSecondLevelNodeText
         : defaultInsertBelowSecondLevelNodeText
-      node.nodeData.children.push({
+      const newNode = {
         inserting: handleMultiNodes ? false : openEdit, // 如果同时对多个节点插入子节点，那么无需进入编辑模式
         data: {
           text: text,
+          uid: createUid(),
           ...params,
           ...(appointData || {})
         },
-        children: [...appointChildren]
-      })
+        children: [...createUidForAppointNodes(appointChildren)]
+      }
+      node.nodeData.children.push(newNode)
       // 插入子节点时自动展开子节点
       node.nodeData.data.expand = true
       if (node.isRoot) {
@@ -644,6 +650,7 @@ class Render {
       if (!node.nodeData.children) {
         node.nodeData.children = []
       }
+      childList = createUidForAppointNodes(childList)
       node.nodeData.children.push(...childList)
       // 插入子节点时自动展开子节点
       node.nodeData.data.expand = true
diff --git a/simple-mind-map/src/utils/index.js b/simple-mind-map/src/utils/index.js
index fbd16515..a882ffcd 100644
--- a/simple-mind-map/src/utils/index.js
+++ b/simple-mind-map/src/utils/index.js
@@ -170,8 +170,10 @@ export const copyNodeTree = (
   keepId = false
 ) => {
   tree.data = simpleDeepClone(root.nodeData ? root.nodeData.data : root.data)
-  // 去除节点uid，因为节点uid不能重复
-  if (tree.data.uid && !keepId) delete tree.data.uid
+  // 重新创建节点uid，因为节点uid不能重复
+  if (!keepId) {
+    tree.data.uid = createUid()
+  }
   if (removeActiveState) {
     tree.data.isActive = false
   }