@magicbe/antd-crud 0.0.45 → 0.0.47

package/dist/components/Action.js

@@ -250,6 +250,7 @@ export var DeleteAction = function (_a) {
     var _b = _a.children, children = _b === void 0 ? delete_action_default_children : _b;
     var _c = Modal.useModal(), modalInstance = _c[0], modalContextHolder = _c[1];
     var _d = useTableContext(), table_ref = _d.table_ref, filter_ref = _d.filter_ref, del = _d.del;
+    var showErrorModal = useCrudConfigContext().showErrorModal;
     var _e = useState(false), loading = _e[0], setLoading = _e[1];
     var onClick = function () { return __awaiter(void 0, void 0, void 0, function () {
         var keys, rows, before, handle, after, res, page_data, filter_data, error_2;
@@ -329,7 +330,7 @@ export var DeleteAction = function (_a) {
                                 return [3 /*break*/, 3];
                             case 2:
                                 error_3 = _a.sent();
-                                modalInstance.error({
+                                showErrorModal && modalInstance.error({
                                     title: "错误",
                                     content: String(error_3)
                                 });

package/dist/components/Add.js

@@ -25,20 +25,23 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useImperativeHandle } from "react";
 import { Form as AntdForm, Empty } from "antd";
 import Field from "./Field";
-import { get, isObject, isString } from "lodash";
+import { get, isFunction, isObject, isString } from "lodash";
 import { useTableContext } from "./Context";
 var AddForm = React.forwardRef(function (_a, ref) {
     var default_data = _a.default_data;
     var form = AntdForm.useForm()[0];
     var columns = useTableContext().columns;
     var fields = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
-        var add = _a.add, edit = _a.edit;
+        var add = _a.add;
         return !!add;
     }).map(function (_a) {
         var add = _a.add, edit = _a.edit, field = _a.field, column = __rest(_a, ["add", "edit", "field"]);
         if (add === true) {
             return Object.assign(column, { field: field });
         }
+        if (isFunction(add)) {
+            return Object.assign(column, { field: add });
+        }
         if (isObject(add)) {
             return Object.assign(column, { field: add });
         }

package/dist/components/Edit.js

@@ -25,7 +25,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useImperativeHandle } from "react";
 import { Form as AntdForm, Empty } from "antd";
 import { useTableContext } from "./Context";
-import { get, isObject, isString } from "lodash";
+import { get, isFunction, isObject, isString } from "lodash";
 import Field from "./Field";
 var EditForm = React.forwardRef(function (_a, ref) {
     var _b = _a.default_data, default_data = _b === void 0 ? {} : _b;
@@ -39,6 +39,9 @@ var EditForm = React.forwardRef(function (_a, ref) {
         if (edit === true) {
             return Object.assign(column, { field: field });
         }
+        if (isFunction(edit)) {
+            return Object.assign(column, { field: edit });
+        }
         if (isObject(edit)) {
             return Object.assign(column, { field: edit });
         }

package/dist/components/Field.js

@@ -40,6 +40,7 @@ var presets = {
 };
 TimePicker.RangePicker;
 var Field = function (props) {
+    var form = Form.useFormInstance();
     var field = props.field, dataIndex = props.dataIndex, title = props.title;
     var _a = useMemo(function () {
         var basic = { name: dataIndex, label: title, rules: [] };
@@ -65,6 +66,17 @@ var Field = function (props) {
         };
         return getNext(field);
     }, [field, dataIndex, title]), Component = _a.Component, name = _a.name, label = _a.label, _b = _a.option, option = _b === void 0 ? {} : _b, rules = _a.rules;
+    // 监听值变化
+    var value = Form.useWatch(null, form);
+    // 监听值变化，根据 filter 函数判断是否展示
+    var show = useMemo(function () {
+        if (!isFunction(field) && isObject(field)) {
+            var _a = field.filter, filter = _a === void 0 ? function () { return true; } : _a;
+            return filter(value, form);
+        }
+    }, [value]);
+    if (!show)
+        return _jsx(Fragment, {});
     return (_jsx(Form.Item, { name: name, label: label, rules: rules, hidden: field === "Hidden", children: _jsx(Component, __assign({}, option)) }));
 };
 export default Field;

package/dist/components/Table.js

@@ -452,6 +452,7 @@ var delete_action_default_children = (_jsxs(Button, { size: "small", type: "link
 export var DeleteAction = function (_a) {
     var _b = _a.children, children = _b === void 0 ? delete_action_default_children : _b, row = _a.row;
     var _c = useTableContext(), table_ref = _c.table_ref, filter_ref = _c.filter_ref, del = _c.del, rowKey = _c.rowKey;
+    var showErrorModal = useCrudConfigContext().showErrorModal;
     var _d = Modal.useModal(), modalInstance = _d[0], modalContextHolder = _d[1];
     var _e = useState(false), loading = _e[0], setLoading = _e[1];
     var _f = useMemo(function () {
@@ -529,7 +530,7 @@ export var DeleteAction = function (_a) {
                                 return [3 /*break*/, 3];
                             case 2:
                                 error_5 = _a.sent();
-                                modalInstance.error({
+                                showErrorModal && modalInstance.error({
                                     title: "错误",
                                     content: String(error_5)
                                 });

package/dist/interface.d.ts

@@ -12,6 +12,7 @@ export interface BaseColumnField<T extends string, O = any> {
     option?: O;
     rules?: Rule[];
     order?: number;
+    filter?: (values: AnyObject, form: FormInstance) => boolean;
 }
 /**隐藏字段 */
 export interface ColumnHiddenField extends BaseColumnField<"Hidden"> {
@@ -84,6 +85,7 @@ export interface CustormColumnField {
     option?: any;
     rules?: Rule[];
     order?: number;
+    filter?: (values: AnyObject, form: FormInstance) => boolean;
 }
 export type ColumnField = ColumnHiddenField | ColumnInputField | ColumnInputPasswordField | ColumnTextAreaField | ColumnInputNumberField | ColumnSelectField | ColumnCascaderField | ColumnTreeSelectField | ColumnCheckboxField | ColumnCheckboxGroupField | ColumnDatePickerField | ColumnDatePickerYearPickerField | ColumnDatePickerMonthPickerField | ColumnDatePickerWeekPickerField | ColumnDatePickerTimePickerField | ColumnDatePickerRangePickerField | ColumnDatePickerQuarterPickerField | ColumnTimePickerField | ColumnTimePickerRangePickerField | ColumnRadioField | ColumnRadioGroupField | ColumnSwitchField | CustormColumnField;
 export type ColumnFieldKeys = ColumnHiddenField["type"] | ColumnInputField["type"] | ColumnInputPasswordField["type"] | ColumnTextAreaField["type"] | ColumnInputNumberField["type"] | ColumnSelectField["type"] | ColumnCascaderField["type"] | ColumnTreeSelectField["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"];

package/package.json

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