@magicbe/antd-crud 0.0.58 → 0.0.60

package/dist/components/Table.js

@@ -101,23 +101,17 @@ var Table = React.forwardRef(function (_a, ref) {
             /**自定义渲染 */
             else if (isFunction(record_1)) {
                 var Component_1 = record_1;
-                nexts === null || nexts === void 0 ? void 0 : nexts.push({
-                    title: "操作",
-                    render: function (value, row, index) { return React.cloneElement(_jsx(Component_1, {}), { value: value, row: row, index: index }); },
-                });
+                nexts === null || nexts === void 0 ? void 0 : nexts.push(__assign({ title: "操作", render: function (value, row, index) { return React.cloneElement(_jsx(Component_1, {}), { value: value, row: row, index: index }); } }, actionColumn));
             }
             /**自定义渲染数组 */
             else if (isArray(record_1)) {
-                nexts === null || nexts === void 0 ? void 0 : nexts.push({
-                    title: "操作",
-                    render: function (value, row, index) {
+                nexts === null || nexts === void 0 ? void 0 : nexts.push(__assign({ title: "操作", render: function (value, row, index) {
                         return (_jsx(Space, { children: record_1.map(function (Component, key) { return React.cloneElement(_jsx(Component, {}, key), {
                                 value: value,
                                 row: row,
                                 index: index,
                             }); }) }));
-                    }
-                });
+                    } }, actionColumn));
             }
             /**对象渲染 */
             else if (isObject(record_1) && !isEmpty(action)) {
@@ -125,9 +119,7 @@ var Table = React.forwardRef(function (_a, ref) {
                 var add_element_1 = _jsx(Fragment, {});
                 var edit_element_1 = _jsx(Fragment, {});
                 var del_element_1 = _jsx(Fragment, {});
-                nexts === null || nexts === void 0 ? void 0 : nexts.push({
-                    title: "操作",
-                    render: function (_, row, index) {
+                nexts === null || nexts === void 0 ? void 0 : nexts.push(__assign({ title: "操作", render: function (_, row, index) {
                         /**新增 */
                         if (add_1 === true)
                             add_element_1 = React.cloneElement(_jsx(AppendAction, {}), { row: row, index: index });
@@ -150,8 +142,7 @@ var Table = React.forwardRef(function (_a, ref) {
                             del_element_1 = React.cloneElement(_jsx(Component, {}), { row: row, index: index });
                         }
                         return (_jsxs(Space, { children: [add_element_1, edit_element_1, del_element_1] }));
-                    }
-                });
+                    } }, actionColumn));
             }
         }
         return nexts;
@@ -190,14 +181,15 @@ var Table = React.forwardRef(function (_a, ref) {
             type: selectionType,
         });
     }, [selectionType]);
-    var loadRecords = function (params) {
+    var loadRecords = function (params, filter, sorter, extra) {
         var _a;
         if (params === void 0) { params = {}; }
+        if (filter === void 0) { filter = {}; }
         setLoading(true);
         var filter_data = (_a = filter_ref === null || filter_ref === void 0 ? void 0 : filter_ref.current) === null || _a === void 0 ? void 0 : _a.form.getFieldsValue();
         if (!getSources)
             return console.warn("getSources is not defined");
-        getSources(Object.assign({}, params, filter_data)).then(function (_a) {
+        getSources(Object.assign({}, params, filter_data), filter, sorter, extra).then(function (_a) {
             var total = _a.total, sources = _a.sources, page = _a.page, size = _a.size;
             setSources(sources);
             setTotal(total);

package/dist/interface.d.ts

@@ -3,7 +3,7 @@ import { type CheckboxGroupProps } from "antd/es/checkbox";
 import { FormInstance, Rule } from "antd/es/form";
 import { PasswordProps, TextAreaProps } from "antd/es/input";
 import { type RadioGroupProps } from "antd/es/radio";
-import { RowSelectionType, type ColumnType as AntdColumnType } from "antd/es/table/interface";
+import { RowSelectionType, SorterResult, TableCurrentDataSource, TablePaginationConfig, type ColumnType as AntdColumnType } from "antd/es/table/interface";
 import React from "react";
 export type AnyObject = Record<PropertyKey, any>;
 /**字段列 */
@@ -112,7 +112,7 @@ export interface GetSourceFunctionParams extends Record<string, any> {
     pageSize?: number;
 }
 /**获取数据的方法 */
-export type getSourceFunction<RecordType = AnyObject> = (params?: GetSourceFunctionParams) => Promise<Source<RecordType>>;
+export type getSourceFunction<RecordType = AnyObject> = (params?: GetSourceFunctionParams, filter?: Record<string, any>, sorter?: SorterResult<RecordType> | SorterResult<RecordType>[], extra?: TableCurrentDataSource<RecordType>) => Promise<Source<RecordType>>;
 export interface Selection<RecordType = AnyObject> {
     keys?: React.Key[];
     rows?: RecordType[];
@@ -167,7 +167,7 @@ export interface DrawerProps {
 /**主体参数 */
 export interface ContentProps<RecordType = AnyObject> extends Omit<AntdTableProps<RecordType>, "columns" | "pagination" | "dataSource" | "loading" | "rowSelection"> {
     columns?: ColumnType<RecordType>[];
-    getSources?: getSourceFunction;
+    getSources?: getSourceFunction<RecordType>;
     add?: add;
     del?: del;
     edit?: edit;
@@ -208,7 +208,7 @@ export type getPageData = () => ({
     current?: number;
     pageSize?: number;
 });
-export type loadRecords = (params?: any) => void;
+export type loadRecords = (params: TablePaginationConfig, filter?: Record<string, any>, sorter?: SorterResult | SorterResult[], extra?: TableCurrentDataSource) => void;
 export type getRecords<T = AnyObject> = () => T[];
 export interface TableRef<RecordType = AnyObject> {
     getPageData: getPageData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicbe/antd-crud",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "antd crud table",
   "author": "wang quan",
   "private": false,