@magicbe/antd-crud 0.0.14 → 0.0.17

package/dist/components/Action.js

@@ -71,7 +71,7 @@ var Action = function (_a, ref) {
     /**自定义渲染 */
     if (isFunction(action)) {
         var Component = action;
-        return (_jsx(Space, __assign({ className: cx(wrapper_css, className) }, { children: _jsx(CustormRender, { children: _jsx(Component, {}) }) })));
+        return (_jsx(CustormRender, { children: _jsx(Component, {}) }));
     }
     /**自定义渲染数组 */
     if (isArray(action)) {
@@ -90,7 +90,7 @@ var Action = function (_a, ref) {
         /**自定义渲染 */
         if (isFunction(master)) {
             var Component = master;
-            return (_jsx(Space, __assign({ className: cx(wrapper_css, className) }, { children: _jsx(CustormRender, { children: _jsx(Component, {}) }) })));
+            return (_jsx(CustormRender, { children: _jsx(Component, {}) }));
         }
         /**自定义渲染数组 */
         if (isArray(master)) {
@@ -107,7 +107,7 @@ var Action = function (_a, ref) {
             {
                 if (isFunction(add)) {
                     var Component = add;
-                    add_element = _jsx(CustormRender, { children: _jsx(Component, {}) });
+                    add_element = (_jsx(CustormRender, { children: _jsx(Component, {}) }));
                 }
                 if (add === true)
                     add_element = _jsx(AppendAction, {});
@@ -116,7 +116,7 @@ var Action = function (_a, ref) {
             {
                 if (isFunction(del)) {
                     var Component = del;
-                    del_element = _jsx(CustormRender, { children: _jsx(Component, {}) });
+                    del_element = (_jsx(CustormRender, { children: _jsx(Component, {}) }));
                 }
                 if (del === true)
                     del_element = _jsx(DeleteAction, {});
@@ -125,7 +125,7 @@ var Action = function (_a, ref) {
             {
                 if (isFunction(edit)) {
                     var Component = edit;
-                    edit_element = _jsx(CustormRender, { children: _jsx(Component, {}) });
+                    edit_element = (_jsx(CustormRender, { children: _jsx(Component, {}) }));
                 }
                 if (edit === true)
                     edit_element = _jsx(EditAction, {});

package/dist/components/Filter.js

@@ -32,12 +32,12 @@ import Field from "./Field";
 import { Button, Form, Space } from "antd";
 import createEmotion from "@emotion/css/create-instance";
 import { SearchOutlined, UndoOutlined } from "@ant-design/icons";
-import { isObject, isString } from "lodash";
+import { isFunction, isObject, isString } from "lodash";
 var _a = createEmotion({ key: "filter" }), css = _a.css, cx = _a.cx;
 var wrapper_css = css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    margin-bottom: 25px;\n"], ["\n    margin-bottom: 25px;\n"])));
 var Filter = function (_a, ref) {
     var form = Form.useForm()[0];
-    var _b = useTableContext(), columns = _b.columns, table_ref = _b.table_ref;
+    var _b = useTableContext(), columns = _b.columns, table_ref = _b.table_ref, filter = _b.filter;
     var filters = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
         var filter = _a.filter;
         return filter;
@@ -64,9 +64,24 @@ var Filter = function (_a, ref) {
     useImperativeHandle(ref, function () { return ({
         form: form,
     }); });
+    var initialValues;
     if (!(filters === null || filters === void 0 ? void 0 : filters.length))
         return _jsx(Fragment, {});
-    return (_jsxs(Form, __assign({ layout: "inline", onFinish: onFinish, className: wrapper_css, form: form }, { children: [filters === null || filters === void 0 ? void 0 : filters.map(function (filter) { return _createElement(Field, __assign({}, filter, { key: String(filter.dataIndex) })); }), _jsxs(Space, { children: [_jsxs(Button, __assign({ htmlType: "submit", type: "primary" }, { children: [_jsx(SearchOutlined, {}), "\u67E5\u8BE2"] })), _jsxs(Button, __assign({ htmlType: "reset" }, { children: [_jsx(UndoOutlined, {}), "\u91CD\u7F6E"] }))] })] })));
+    if (filter === false)
+        return _jsx(Fragment, {});
+    if (isFunction(filter)) {
+        var Component = filter;
+        return _jsx(Component, { onFinish: onFinish, filters: filters, form: form });
+    }
+    if (isObject(filter)) {
+        var render = filter.render, _initialValues_ = filter.initialValues;
+        initialValues = _initialValues_;
+        if (!!render) {
+            var Component = render;
+            return _jsx(Component, { onFinish: onFinish, filters: filters, form: form, initialValues: _initialValues_ });
+        }
+    }
+    return (_jsxs(Form, __assign({ layout: "inline", onFinish: onFinish, className: wrapper_css, form: form, initialValues: initialValues }, { children: [filters === null || filters === void 0 ? void 0 : filters.map(function (filter) { return _createElement(Field, __assign({}, filter, { key: String(filter.dataIndex) })); }), _jsxs(Space, { children: [_jsxs(Button, __assign({ htmlType: "submit", type: "primary" }, { children: [_jsx(SearchOutlined, {}), "\u67E5\u8BE2"] })), _jsxs(Button, __assign({ htmlType: "reset" }, { children: [_jsx(UndoOutlined, {}), "\u91CD\u7F6E"] }))] })] })));
 };
 export default React.forwardRef(Filter);
 var templateObject_1;

package/dist/components/Table.js

@@ -65,7 +65,7 @@ import { useTableContext } from "./Context";
 import AddForm from "./Add";
 import EditForm from "./Edit";
 var Table = function (_a, ref) {
-    var _b = useTableContext(), getSources = _b.getSources, selectionType = _b.rowSelection, action = _b.action, content_ref = _b.content_ref, props = __rest(_b, ["getSources", "rowSelection", "action", "content_ref"]);
+    var _b = useTableContext(), getSources = _b.getSources, selectionType = _b.rowSelection, action = _b.action, content_ref = _b.content_ref, filter_ref = _b.filter_ref, props = __rest(_b, ["getSources", "rowSelection", "action", "content_ref", "filter_ref"]);
     var _c = useState([]), sources = _c[0], setSources = _c[1];
     var _d = useState(), total = _d[0], setTotal = _d[1];
     var _e = useState(), page = _e[0], setPage = _e[1];
@@ -175,8 +175,11 @@ var Table = function (_a, ref) {
         type: selectionType,
     } : undefined;
     var loadRecords = function (params) {
+        var _a;
+        if (params === void 0) { params = {}; }
         setLoading(true);
-        getSources(params).then(function (_a) {
+        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();
+        getSources(Object.assign({}, params, filter_data)).then(function (_a) {
             var total = _a.total, sources = _a.sources, page = _a.page, size = _a.size;
             setSources(sources);
             setTotal(total);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { type AnyObject, type BaseColumnField, type ColumnInputField, type ColumnTextAreaField, type ColumnInputNumberField, type ColumnSelectField, type ColumnCascaderField, type ColumnCheckboxField, type ColumnCheckboxGroupField, type ColumnDatePickerField, type ColumnDatePickerYearPickerField, type ColumnDatePickerMonthPickerField, type ColumnDatePickerWeekPickerField, type ColumnDatePickerTimePickerField, type ColumnDatePickerRangePickerField, type ColumnDatePickerQuarterPickerField, type ColumnTimePickerField, type ColumnTimePickerRangePickerField, type ColumnRadioField, type ColumnRadioGroupField, type ColumnSwitchField, type ColumnField, type ColumnFieldKeys, type ColumnType, type Source, type getSourceFunction, type add, type addHandleMap, type edit, type editHandleMap, type del, type MasterCustomActionGroup, type RecordCustomActionGroup, type CustomActionGroup, type CustomAction, type ContentProps, type ContentRef, } from "./interface";
+export { type AnyObject, type BaseColumnField, type ColumnInputField, type ColumnTextAreaField, type ColumnInputNumberField, type ColumnSelectField, type ColumnCascaderField, type ColumnCheckboxField, type ColumnCheckboxGroupField, type ColumnDatePickerField, type ColumnDatePickerYearPickerField, type ColumnDatePickerMonthPickerField, type ColumnDatePickerWeekPickerField, type ColumnDatePickerTimePickerField, type ColumnDatePickerRangePickerField, type ColumnDatePickerQuarterPickerField, type ColumnTimePickerField, type ColumnTimePickerRangePickerField, type ColumnRadioField, type ColumnRadioGroupField, type ColumnSwitchField, type ColumnField, type ColumnFieldKeys, type ColumnType, type Source, type getSourceFunction, type GetSourceFunctionParams, type add, type addHandleMap, type edit, type editHandleMap, type del, type CustomFilter, type filter, type MasterCustomActionGroup, type RecordCustomActionGroup, type CustomActionGroup, type CustomAction, type ContentProps, type ContentRef, } from "./interface";
 export { default as CrudTable, } from "./components";
 export { TableContextProvider, useTableContext, } from "./components/Context";
 export { default as Filter, type FilterProps, type FilterRef, } from "./components/Filter";

package/dist/interface.d.ts

@@ -1,6 +1,6 @@
 import { type TableProps, type InputProps, type SelectProps, type CascaderProps, type DatePickerProps, type InputNumberProps, type CheckboxProps, type RadioProps, type SwitchProps, type TimePickerProps } from "antd";
 import { type CheckboxGroupProps } from "antd/es/checkbox";
-import { Rule } from "antd/es/form";
+import { FormInstance, Rule } from "antd/es/form";
 import { TextAreaProps } from "antd/es/input";
 import { type RadioGroupProps } from "antd/es/radio";
 import { RowSelectionType, type ColumnType as AntdColumnType } from "antd/es/table/interface";
@@ -94,8 +94,12 @@ export type Source<RecordType = AnyObject> = {
     /**每页几条 */
     size: number;
 };
+export interface GetSourceFunctionParams extends Record<string, any> {
+    current?: number;
+    pageSize?: number;
+}
 /**获取数据的方法 */
-export type getSourceFunction = <RecordType = AnyObject>(params?: any) => Promise<Source<RecordType>>;
+export type getSourceFunction = <RecordType = AnyObject>(params?: GetSourceFunctionParams) => Promise<Source<RecordType>>;
 export interface Selection<RecordType = AnyObject> {
     keys?: React.Key[];
     rows?: RecordType[];
@@ -122,6 +126,19 @@ export type editHandleMap = Partial<HandleMap<editHandle> & {
 }>;
 /**编辑方法 */
 export type edit = editHandle | editHandleMap;
+export interface CustomFilterProps {
+    onFinish: (values: any) => void;
+    filters: Omit<ColumnType<any>, "filter">[];
+    form: FormInstance<any>;
+    initialValues?: Record<string, any>;
+}
+export type CustomFilter = React.FC<CustomFilterProps>;
+export type CustomFilterObject = {
+    render?: CustomFilter;
+    initialValues?: Record<string, any>;
+};
+/**自定义过滤 */
+export type filter = false | CustomFilter | CustomFilterObject;
 export interface CustomActionGroup {
     add?: boolean | React.FC;
     del?: boolean | React.FC;
@@ -144,6 +161,7 @@ export interface ContentProps<RecordType = AnyObject> extends Omit<TableProps<Re
     add?: add;
     del?: del;
     edit?: edit;
+    filter?: filter;
     action?: Action;
     rowSelection?: RowSelectionType;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@magicbe/antd-crud",
-    "version": "0.0.14",
+    "version": "0.0.17",
     "description": "antd crud table",
     "author": "wang quan",
     "private": false,
@@ -58,4 +58,4 @@
             "pre-commit": "yarn lint"
         }
     }
-}
+}