@fe-free/core 2.2.9 → 2.2.11

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 2.2.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @fe-free/tool@2.2.11
+
+## 2.2.10
+
+### Patch Changes
+
+- feat: true
+  - @fe-free/tool@2.2.10
+
 ## 2.2.9
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "remark-gfm": "^4.0.1",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.2.9"
+    "@fe-free/tool": "2.2.11"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/tree/index.tsx

@@ -3,7 +3,7 @@ import { useDebounce } from 'ahooks';
 import type { TreeProps as AntdTreeProps } from 'antd';
 import { Tree as AntdTree, Input } from 'antd';
 import type { DataNode } from 'antd/es/tree';
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { flatToTreeData } from './helper';
 
 interface TreeProps<T extends DataNode> extends AntdTreeProps<T> {
@@ -101,8 +101,32 @@ function Tree<T extends DataNode>(props: TreeProps<T>) {
     treeData: filterTreeData,
     search: debouncedSearch,
   });
+  const newTreeData = highlightedTreeData;
 
-  const node = <AntdTree {...rest} treeData={highlightedTreeData} />;
+  const handleSearch = useCallback((e) => {
+    setSearch(e.target.value);
+  }, []);
+
+  const searchExpandKeysProps = useMemo(() => {
+    if (!debouncedSearch) {
+      return {};
+    }
+
+    const keys: string[] = [];
+    function loop(arr) {
+      arr.forEach((item) => {
+        keys.push(item.key);
+        if (item.children) {
+          loop(item.children);
+        }
+      });
+    }
+    loop(newTreeData);
+
+    return { expandedKeys: keys };
+  }, [debouncedSearch, newTreeData]);
+
+  const node = <AntdTree {...searchExpandKeysProps} {...rest} treeData={newTreeData} />;
 
   if (!enableSearch) {
     return node;
@@ -114,11 +138,7 @@ function Tree<T extends DataNode>(props: TreeProps<T>) {
       start={
         enableSearch && (
           <div className="px-2 pb-2">
-            <Input.Search
-              placeholder="搜索"
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-            />
+            <Input.Search placeholder="搜索" value={search} onChange={handleSearch} />
           </div>
         )
       }