@fe-free/core 3.0.32 → 3.0.33

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @fe-free/core
 
+## 3.0.33
+
+### Patch Changes
+
+- feat: tree
+- Updated dependencies
+  - @fe-free/tool@3.0.33
+  - @fe-free/icons@3.0.33
+
 ## 3.0.32
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.32",
+  "version": "3.0.33",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -46,8 +46,8 @@
     "antd": "^5.27.1",
     "dayjs": "~1.11.10",
     "react": "^19.2.0",
-    "@fe-free/icons": "3.0.32",
-    "@fe-free/tool": "3.0.32"
+    "@fe-free/icons": "3.0.33",
+    "@fe-free/tool": "3.0.33"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/tree/file_tree.tsx

@@ -198,7 +198,7 @@ function FileTree<D extends DataNode>(props: FileTreeProps<D>) {
     (nodeData) => {
       const hasMore = actions?.includes('update') || actions?.includes('delete');
       return (
-        <div className="group flex items-center gap-2">
+        <div className="group flex items-center gap-1">
           {nodeData.children ? (
             <FileCard.FileIcon isDirectory className="text-base" />
           ) : (

package/src/tree/tree.tsx

@@ -108,6 +108,32 @@ function useFilterTreeData({ treeData, search }) {
   }, [treeData, search]);
 }
 
+function useTreeData({ treeData }) {
+  return useMemo(() => {
+    if (!treeData) {
+      return treeData;
+    }
+
+    function process(nodes) {
+      // 返回自己。 而非 [] undefined，因为要保留原数据格式。
+      if (!nodes || nodes.length === 0) {
+        return nodes;
+      }
+
+      return nodes.map((node) => {
+        return {
+          ...node,
+          // 如果没有显式设置 isLeaf，则 children 没传代表是叶子节点，否则还是个 dir
+          isLeaf: node.isLeaf ?? !node.children,
+          children: process(node.children),
+        };
+      });
+    }
+
+    return process(treeData);
+  }, [treeData]);
+}
+
 function useIsAllLeaf(treeData?: DataNode[]) {
   return useMemo(() => {
     if (treeData) {
@@ -134,7 +160,7 @@ function Tree<T extends DataNode>(props: TreeProps<T>) {
     treeData: filterTreeData,
     search: debouncedSearch,
   });
-  const newTreeData = highlightedTreeData;
+  const newTreeData = useTreeData({ treeData: highlightedTreeData });
 
   const handleSearch = useCallback((e) => {
     setSearch(e.target.value);