@fe-free/core 3.0.32 → 3.0.34

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @fe-free/core
 
+## 3.0.34
+
+### Patch Changes
+
+- feat: crud
+  - @fe-free/icons@3.0.34
+  - @fe-free/tool@3.0.34
+
+## 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.34",
   "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.34",
+    "@fe-free/tool": "3.0.34"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/core_app/index.tsx

@@ -2,6 +2,7 @@ import { ProConfigProvider } from '@ant-design/pro-components';
 import { useTitle } from 'ahooks';
 import { App, ConfigProvider } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
+import classNames from 'classnames';
 import { merge } from 'lodash-es';
 import { useEffect, useMemo } from 'react';
 import { BrowserRouter as Router, useNavigate } from 'react-router-dom';
@@ -103,6 +104,9 @@ function CoreApp(props: {
   appProps?: Omit<React.ComponentProps<typeof App>, 'children'>;
   routerProps?: Omit<Partial<React.ComponentProps<typeof Router>>, 'children'>;
   children: React.ReactNode;
+  customConfig?: {
+    hiddenFormItemLabelColon?: boolean;
+  };
 }) {
   const {
     basename,
@@ -113,6 +117,7 @@ function CoreApp(props: {
     configProviderProps,
     appProps,
     routerProps,
+    customConfig,
   } = props;
 
   useTitle(name || '');
@@ -140,7 +145,12 @@ function CoreApp(props: {
         locale={configProviderProps?.locale || zhCN}
         theme={theme}
       >
-        <App {...appProps}>
+        <App
+          {...appProps}
+          className={classNames('fec-app', appProps?.className, {
+            'fec-app-hidden-form-item-label-colon': customConfig?.hiddenFormItemLabelColon,
+          })}
+        >
           <Router {...routerProps} basename={basename}>
             <SetRouteTool basename={basename} />
             {enableCheckUpdate && <CheckUpdate basename={basename} />}

package/src/crud/crud.stories.tsx

@@ -171,6 +171,16 @@ export const MoreCustom: Story = {
           toolBarRender: () => {
             return [<div key="custom1">自定义1</div>, <div key="custom2">自定义2</div>];
           },
+          search: {
+            optionRender: (_, __, dom) => {
+              return [
+                ...dom,
+                <Button key="1" type="primary" className="ml-2">
+                  额外的按钮
+                </Button>,
+              ];
+            },
+          },
         }}
         operateColumnProps={{
           // 自定义宽度

package/src/crud_of_pure/index.tsx

@@ -13,7 +13,10 @@ interface CRUDOfPureProps<
   specialToolbar?: boolean;
 }
 
-function CRUDOfPure(props: CRUDOfPureProps) {
+function CRUDOfPure<
+  DataSource extends Record<string, any> = any,
+  Key extends string | number = string,
+>(props: CRUDOfPureProps<DataSource, Key>) {
   const newColumns = props.tableProps.columns?.map((column) => {
     if (column.search) {
       return {

package/src/style.scss

@@ -14,9 +14,11 @@
 /* stylelint-disable-next-line at-rule-no-unknown */
 @tailwind utilities;
 
-// 隐藏 label 的冒号
-.ant-form-item .ant-form-item-label > label::after {
-  visibility: hidden;
+.fec-app-hidden-form-item-label-colon {
+  // 隐藏 label 的冒号
+  .ant-form-item .ant-form-item-label > label::after {
+    visibility: hidden;
+  }
 }
 
 .ant-modal-footer {

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);