From 7d90ce4c6bc0d7d4a7edb937551a9e66b8ca8d05 Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Fri, 15 Dec 2023 22:55:07 +0800
Subject: [PATCH] fix:Tree search bug

---
 CHANGELOG.md                             | 10 +++++++++
 CHANGELOG_CN.md                          | 10 +++++++++
 chat2db-client/src/blocks/Tree/index.tsx | 26 +++++++++++++++++++-----
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7acc425b9..4b5a44eb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 3.1.13
+
+`2023-12-15`
+
+**更新日志**
+
+- 🐞【Fixed】Switching tab causes edit data reset problem
+- 🐞【Fixed】Rename is reset after switching tab
+
+
 ## 3.1.12
 
 `2023-12-15`
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index f70d54c26..1967c4669 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -1,3 +1,13 @@
+## 3.1.13
+
+`2023-12-15`
+
+**更新日志**
+
+- 🐞【修复】切换tab导致编辑数据重置问题
+- 🐞【修复】切换tab后重命名被重置
+
+
 ## 3.1.12
 
 `2023-12-15`
diff --git a/chat2db-client/src/blocks/Tree/index.tsx b/chat2db-client/src/blocks/Tree/index.tsx
index 8e322b094..fe63331ed 100644
--- a/chat2db-client/src/blocks/Tree/index.tsx
+++ b/chat2db-client/src/blocks/Tree/index.tsx
@@ -57,29 +57,45 @@ const isMatch = (target: string, searchValue: string) => {
 // 树结构搜索
 function searchTree(treeData: ITreeNode[], searchValue: string): ITreeNode[] {
   let result: ITreeNode[] = [];
+
+  // 深度优先遍历
   function dfs(node: ITreeNode, path: ITreeNode[] = []) {
     if (isMatch(node.name, searchValue)) {
+      // debugger
       result = [...result,...path, node];
-      return true;
+      // return true;
     }
     if (!node.children) return false;
     for (const child of node.children) {
-      if (dfs(child, [...path, node])) return true;
+      // debugger
+      if (dfs(child, [...path, node])){
+        return true;
+      }
     }
     return false;
   }
 
+  // 遍历树
   treeData.forEach((node) => dfs(node));
 
+  // 如果不匹配，说明该节点为path，不需要保留该节点的子元素，就把children置空
   result.forEach((item) => {
     if(!isMatch(item.name, searchValue)){
       item.children = null;
     }
   });
 
+  // tree转平级
   const smoothTreeList: ITreeNode[] = []
   smoothTree(result, smoothTreeList);
-  return smoothTreeList;
+
+  // 对smoothTreeList根据uuid去重
+  const deWeightList: ITreeNode[] = [];
+  smoothTreeList.forEach((item) => {
+    deWeightList.findIndex((i) => i.uuid === item.uuid) === -1 && deWeightList.push(item);
+  });
+
+  return deWeightList;
 }
 
 const itemHeight = 26; // 每个 item 的高度
@@ -126,11 +142,11 @@ const Tree = (props: IProps) => {
     if (searchValue && treeData) {
       const _searchTreeData = searchTree(cloneDeep(treeData), searchValue)
       setSearchTreeData(_searchTreeData);
+      setScrollTop(0);
     } else {
       setSearchTreeData(null);
     }
-    setScrollTop(0);
-  }, [searchValue, smoothTreeData,treeData]);
+  }, [searchValue, treeData]);
 
   return (
     <LoadingContent isLoading={!treeData} className={classnames(className)}>