@fe-free/core 1.4.6 → 1.4.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 1.4.8
+
+### Patch Changes
+
+- feat: crud
+  - @fe-free/tool@1.4.8
+
+## 1.4.7
+
+### Patch Changes
+
+- fix: crud
+  - @fe-free/tool@1.4.7
+
 ## 1.4.6
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -35,7 +35,7 @@
     "react-syntax-highlighter": "^15.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "1.4.6"
+    "@fe-free/tool": "1.4.8"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "^2.8.7",

package/src/crud/crud.tsx

@@ -1,5 +1,6 @@
 import type { ActionType } from '@ant-design/pro-components';
-import { Button, Space } from 'antd';
+import { Button, message, Space } from 'antd';
+import { isString } from 'lodash-es';
 import { forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from 'react';
 import type { TableProps } from '../table';
 import { Table } from '../table';
@@ -73,7 +74,17 @@ function CRUDComponent<
     (record) => {
       return () => {
         if (requestDeleteByRecord) {
+          let content = '删除成功';
+          if (deleteProps?.successText) {
+            content = isString(deleteProps.successText)
+              ? deleteProps.successText
+              : deleteProps.successText();
+          }
           return requestDeleteByRecord(record).then(() => {
+            message.open({
+              type: 'success',
+              content,
+            });
             actionRef.current?.reload();
           });
         }
@@ -81,7 +92,7 @@ function CRUDComponent<
         throw new Error('没有传 requestDeleteByRecord');
       };
     },
-    [requestDeleteByRecord],
+    [deleteProps, requestDeleteByRecord],
   );
 
   const handleReload = useCallback(() => {
@@ -89,6 +100,8 @@ function CRUDComponent<
   }, []);
 
   const newColumns = useMemo(() => {
+    const idField = tableProps.rowKey || 'id';
+
     const operateColumn = {
       title: '操作',
       fixed: 'right',
@@ -99,7 +112,7 @@ function CRUDComponent<
             {operateColumnProps?.moreOperator && operateColumnProps.moreOperator(record)}
             {actions.includes('read') && (
               <CRUDDetail
-                id={record.id}
+                id={record[idField]}
                 record={record}
                 onSuccess={handleReload}
                 trigger={<a>{readProps?.operateText || '查看'}</a>}
@@ -117,7 +130,7 @@ function CRUDComponent<
             )}
             {actions.includes('update') && (
               <CRUDDetail
-                id={record.id}
+                id={record[idField]}
                 record={record}
                 onSuccess={handleReload}
                 trigger={<a>{updateProps?.operateText || '编辑'}</a>}
@@ -155,9 +168,10 @@ function CRUDComponent<
 
     return tableProps.columns as TableProps['columns'];
   }, [
+    tableProps.rowKey,
+    tableProps.columns,
     operateColumnProps,
     actions,
-    tableProps.columns,
     handleReload,
     readProps?.operateText,
     readProps?.target,

package/src/crud/types.tsx

@@ -98,6 +98,8 @@ interface CRUDProps<DataSource = any, Key = string> {
     desc?: string;
     /** 文本 */
     operateText?: string;
+    /** 成功文案 */
+    successText?: string | (() => string);
   };
 
   // *** 批量操作 ***

package/src/form/form.stories.tsx

@@ -77,6 +77,13 @@ export const ProFormSwitchNumberComponent: Story = {
   render: () => (
     <ProFormBase>
       <ProFormSwitchNumber name="switchNumber" />
+      <ProFormSwitchNumber
+        name="switchNumber"
+        fieldProps={{
+          checkedChildren: '开启',
+          unCheckedChildren: '关闭',
+        }}
+      />
     </ProFormBase>
   ),
 };

package/src/form/index.tsx

@@ -1,6 +1,10 @@
-export { ProFormSwitchNumber, SwitchNumber, type SwitchNumberProps } from './form_switch_number';
 export { ProFormJavascript } from './pro_form_javascript';
 export { ProFormJSON } from './pro_form_json';
+export {
+  ProFormSwitchNumber,
+  SwitchNumber,
+  type SwitchNumberProps,
+} from './pro_form_switch_number';
 import { pinyinMatch } from '@fe-free/tool';
 
 /** ProFromSelect 搜索相关 props。 支持 1 搜索 2 拼音过滤 */

package/src/form/pro_form_javascript.tsx

@@ -12,7 +12,6 @@ function JavascriptItem(props: EditorJavascriptProps) {
 }
 
 function ProFormJavascript(props: ProFormItemProps<EditorJavascriptProps>) {
-  // 没搞明白 cacheFormSwr, proFieldKey, onBlur，先这样处理
   /* eslint-disable-next-line */
   const { fieldProps, readonly, ...rest } = props;
 

package/src/form/pro_form_json.tsx

@@ -12,7 +12,6 @@ function JSONItem(props: EditorJSONProps) {
 }
 
 function ProFormJSON(props: ProFormItemProps<EditorJSONProps>) {
-  // 没搞明白 cacheFormSwr, proFieldKey, onBlur，先这样处理
   /* eslint-disable-next-line */
   const { fieldProps, readonly, ...rest } = props;
 

package/src/form/{form_switch_number.tsx → pro_form_switch_number.tsx}

@@ -25,7 +25,6 @@ function SwitchNumber(props: SwitchNumberProps) {
 }
 
 function ProFormSwitchNumber(props: ProFormItemProps<SwitchNumberProps>) {
-  // 没搞明白 cacheFormSwr, proFieldKey, onBlur，先这样处理
   /* eslint-disable-next-line */
   const { fieldProps, readonly, ...rest } = props;