@fe-free/core 1.0.3 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @fe-free/core
 
+## 1.1.2
+
+### Patch Changes
+
+- fix: curd 调整
+  - @fe-free/tool@1.1.2
+
+## 1.1.1
+
+### Patch Changes
+
+- fix: 调整 crud props
+  - @fe-free/tool@1.1.1
+
+## 1.1.0
+
+### Minor Changes
+
+- feat: 优化 date
+
+### Patch Changes
+
+- Updated dependencies
+  - @fe-free/tool@1.1.0
+
 ## 1.0.3
 
 ### Patch Changes

package/package.json

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

package/src/crud/crud.tsx

@@ -39,7 +39,7 @@ interface CRUDProps {
   };
 
   /** 删除接口 */
-  deleteByRecord?: (record) => Promise<any>;
+  requestDeleteByRecord?: (record) => Promise<any>;
   /** 删除相关 */
   deleteProps?: {
     /** 显示名称索引 */
@@ -89,7 +89,7 @@ const CRUD = forwardRef<CRUDMethods, CRUDProps>(function CRUD(props, ref) {
     createButton,
     operateColumnProps,
     readProps,
-    deleteByRecord,
+    requestDeleteByRecord,
     deleteProps,
     detailIdIndex,
     detailForm,
@@ -138,16 +138,16 @@ const CRUD = forwardRef<CRUDMethods, CRUDProps>(function CRUD(props, ref) {
   const getHandleDelete = useCallback(
     (record) => {
       return () => {
-        if (deleteByRecord) {
-          return deleteByRecord(record).then(() => {
+        if (requestDeleteByRecord) {
+          return requestDeleteByRecord(record).then(() => {
             actionRef.current?.reload();
           });
         }
 
-        throw new Error('没有传 deleteByRecord');
+        throw new Error('没有传 requestDeleteByRecord');
       };
     },
-    [deleteByRecord]
+    [requestDeleteByRecord]
   );
 
   const handleReload = useCallback(() => {
@@ -218,17 +218,18 @@ const CRUD = forwardRef<CRUDMethods, CRUDProps>(function CRUD(props, ref) {
 
     return tableProps.columns as TableProps['columns'];
   }, [
+    operateColumnProps,
     actions,
+    tableProps.columns,
+    handleReload,
     readProps?.operateText,
-    deleteProps,
-    detailIdIndex,
+    readProps?.target,
     detailProps,
-    getHandleDelete,
-    handleReload,
-    tableProps.columns,
     location.pathname,
-    operateColumnProps,
+    detailIdIndex,
     updateProps?.operateText,
+    deleteProps,
+    getHandleDelete,
   ]);
 
   const toolBarRender = useCallback(

package/src/crud/crud_detail.tsx

@@ -123,12 +123,9 @@ function CRUDDetail(props: CRUDDetailProps) {
       if (id) {
         setLoading(true);
 
-        let res;
-        if (requestGetByRecord) {
-          res = await requestGetByRecord(record);
-        }
+        const d = await requestGetByRecord?.(record);
 
-        form?.setFieldsValue(res.data.data);
+        form?.setFieldsValue(d);
 
         setLoading(false);
       }

package/src/crud/demo/data.tsx

@@ -82,11 +82,7 @@ async function fakeGetByRecord(record) {
 
   return new Promise((resolve) => {
     setTimeout(() => {
-      resolve({
-        data: {
-          data: fakeData.find((item) => item.id === record.id),
-        },
-      });
+      resolve(fakeData.find((item) => item.id === record.id));
     }, 1000);
   });
 }

package/src/crud/demo/index.tsx

@@ -45,7 +45,7 @@ const Normal = () => {
         columns,
         request: fakeRequest,
       }}
-      deleteByRecord={fakeDeleteByRecord}
+      requestDeleteByRecord={fakeDeleteByRecord}
       deleteProps={{
         nameIndex: 'name',
       }}
@@ -309,7 +309,7 @@ const CustomText = () => {
       readProps={{
         operateText: '查看啦',
       }}
-      deleteByRecord={fakeDeleteByRecord}
+      requestDeleteByRecord={fakeDeleteByRecord}
       deleteProps={{
         nameIndex: 'name',
         operateText: '删除啦',

package/src/crud/index.md

@@ -95,26 +95,25 @@ type CrudAction = 'create' | 'read' | 'read_detail' | 'update' | 'delete';
 interface CRUDProps {
   actions: CrudAction[];
 
-  /** 表格相关 */
-  tableProps: TableProps;
-
   /** 新建按钮，默认新建 */
   createButton?: ReactNode;
 
+  /** 表格相关 */
+  tableProps: TableProps;
   operateColumnProps?: {
     width?: number;
     /** 扩展操作区域 */
     moreOperator?: (record) => ReactNode;
   };
-
   readProps?: {
     /** 文本 */
     operateText?: string;
+    /** 打开方式, action 为 read_detail 有效 */
+    target?: '_blank';
   };
 
   /** 删除接口 */
-  deleteById?: ({ id, ids }) => Promise<any>;
-  deleteByRecord?: (record) => Promise<any>;
+  requestDeleteByRecord?: (record) => Promise<any>;
   /** 删除相关 */
   deleteProps?: {
     /** 显示名称索引 */
@@ -131,9 +130,8 @@ interface CRUDProps {
   detailFormInstance?: ProFormInstance;
 
   /** 新增接口 */
-  requestAdd?: (values) => Promise<any>;
-
-  addProps?: {
+  requestCreate?: (values) => Promise<any>;
+  createProps?: {
     /** 成功文案 */
     successText?: string | (() => string);
   };
@@ -148,12 +146,9 @@ interface CRUDProps {
   };
 
   /** 获取详情接口 */
-  requestGetById?: ({ id }) => Promise<any>;
-
-  /** 获取详情接口，非 id 的时候 */
   requestGetByRecord?: (record) => Promise<any>;
 
-  /** 跳转到详情的 id 所以，默认 id */
+  /** 跳转到详情的索引 ，默认 id */
   detailIdIndex?: string;
 }
 

package/src/value_type_map/date.tsx

@@ -1,15 +1,7 @@
 import React from 'react';
 import { ProFormDateRangePicker } from '@ant-design/pro-components';
 import dayjs from 'dayjs';
-import { isString } from 'lodash-es';
-
-function getDayjs(text: string | number) {
-  if (isString(text) && /^\d+$/.test(text as string)) {
-    return dayjs(parseInt(text as string));
-  }
-  // 其他都可以 dayjs
-  return dayjs(text);
-}
+import { getDayjs } from '@fe-free/tool';
 
 const renderMap = {
   dateTime: (text) => {

package/src/value_type_map/index.md

@@ -9,6 +9,8 @@ toc: content
 
 ## customValueTypeMap
 
+配置 customValueTypeMap
+
 ```tsx | pure
 import { customValueTypeMap } from '@fe-free/core';
 import { ProConfigProvider } from '@ant-design/pro-components';
@@ -24,6 +26,8 @@ export default Demo;
 
 ## CustomValueTypeEnum
 
+使用
+
 ```tsx | pure
 enum CustomValueTypeEnum {
   /** 渲染时间 + 搜索日期范围 */
@@ -48,6 +52,7 @@ async function fakeRequest() {
     timeNumber: +dayjs('2024-10-01 10:00:00'),
     dateStr: `2024-10-01`,
     dateNumber: +dayjs('2024-10-01'),
+    seconds: Math.abs(+dayjs('2024-10-01') / 1000),
     jsonText: JSON.stringify({ name: 'hello world hello world hello world' }),
   }));
 
@@ -88,6 +93,12 @@ const Table = () => {
       valueType: CustomValueTypeEnum.CustomDateAndDateRange,
       search: true,
     },
+    {
+      title: '秒数',
+      dataIndex: 'seconds',
+      valueType: CustomValueTypeEnum.CustomDateAndDateRange,
+      search: true,
+    },
     {
       title: 'json',
       dataIndex: 'jsonText',