wargerm 0.5.27 → 0.5.30

package/dist/components/WForm/example/demo1.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/example/demo2.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/example/demo3.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/index.d.ts

@@ -54,6 +54,7 @@ export interface WFormProps extends FormProps {
     columns: ColumnProps[];
     extraColumns?: ColumnProps[];
     disabled?: boolean;
+    deps?: any;
     disabledHideInSearch?: boolean;
     setForm?: (form: any) => void;
     onSubmit?: (params: Record<string, any>) => void;

package/dist/index.esm.js

@@ -7192,7 +7192,7 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm"];
+var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
 var RangePicker$2 = Index$6.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7208,6 +7208,7 @@ var WForm = function WForm(props, ref) {
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       setForm = props.setForm,
+      deps = props.deps,
       extraProps = _objectWithoutProperties(props, _excluded$7);
 
   var _Form$useForm = _Form.useForm(),
@@ -7746,8 +7747,8 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
-  ]);
+  }, [changedValues, columns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
+  ]));
   var filterExtraColumnsForm = useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       if (c.type == 'group') {
@@ -7758,7 +7759,7 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]));
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();
@@ -10499,7 +10500,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
+var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10516,6 +10517,9 @@ var ModalForm = function ModalForm(props, ref) {
       onFormChange = props.onFormChange,
       formItemChild = props.formItemChild,
       onCancel = props.onCancel,
+      modalHeaderSolt = props.modalHeaderSolt,
+      modalFooterSolt = props.modalFooterSolt,
+      formProps = props.formProps,
       extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var formRef = useRef(null);
@@ -10609,6 +10613,7 @@ var ModalForm = function ModalForm(props, ref) {
               _context2.next = 5;
               return submitMethod(values, function () {
                 setVisible(false);
+                onCancel && onCancel();
               });
 
             case 5:
@@ -10646,7 +10651,7 @@ var ModalForm = function ModalForm(props, ref) {
     onOk: handleOk,
     confirmLoading: confirmLoading,
     onCancel: handleCancel
-  }, extraProps), /*#__PURE__*/React.createElement(WForm$1, {
+  }, extraProps), modalHeaderSolt, /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
@@ -10656,12 +10661,12 @@ var ModalForm = function ModalForm(props, ref) {
     search: search,
     columns: columns,
     extraColumns: extraColumns
-  }), title == '查看' && formItemChild ? formItemChild() : null);
+  }, formProps || {})), title == '查看' && formItemChild ? formItemChild() : null, modalFooterSolt);
 };
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination", "noBordered"];
+var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10676,6 +10681,7 @@ var TabelCard = function TabelCard(props, ref) {
       style = props.style,
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
+      searchFormConfig = props.searchFormConfig,
       optionColumnConfig = props.optionColumnConfig,
       pagination = props.pagination,
       noBordered = props.noBordered,
@@ -10695,11 +10701,7 @@ var TabelCard = function TabelCard(props, ref) {
       modalFormConfig = _useState4[0],
       setModalFormConfig = _useState4[1];
 
-  var _useState5 = useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      formSearch = _useState6[0],
-      setFormSearch = _useState6[1];
-
+  var formSearchRef = useRef({});
   var modalFormColumn = deepCopy(columns) || [];
   var formSearchColumn = deepCopy(columns) || [];
   useImperativeHandle(ref, function () {
@@ -10894,11 +10896,45 @@ var TabelCard = function TabelCard(props, ref) {
             key: i
           }, /*#__PURE__*/React.createElement("a", {
             key: btn.key,
-            onClick: function onClick() {
-              var _actionHandler$item$t;
+            onClick: function () {
+              var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+                var _actionHandler$item$t;
+
+                var info;
+                return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                  while (1) {
+                    switch (_context5.prev = _context5.next) {
+                      case 0:
+                        info = null;
+
+                        if (!item.fetchInfo) {
+                          _context5.next = 5;
+                          break;
+                        }
 
-              return (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, record, index);
-            }
+                        _context5.next = 4;
+                        return item.fetchInfo(record);
+
+                      case 4:
+                        info = _context5.sent;
+
+                      case 5:
+                        (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, info || record, index);
+
+                      case 6:
+                      case "end":
+                        return _context5.stop();
+                    }
+                  }
+                }, _callee5);
+              }));
+
+              function onClick() {
+                return _onClick.apply(this, arguments);
+              }
+
+              return onClick;
+            }()
           }, btn.icon, " ", btn.title));
         }
 
@@ -10917,11 +10953,45 @@ var TabelCard = function TabelCard(props, ref) {
             key: i
           }, /*#__PURE__*/React.createElement("a", {
             key: btn.key,
-            onClick: function onClick() {
-              var _actionHandler$item$t3;
+            onClick: function () {
+              var _onClick2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+                var _actionHandler$item$t3;
+
+                var info;
+                return regeneratorRuntime.wrap(function _callee6$(_context6) {
+                  while (1) {
+                    switch (_context6.prev = _context6.next) {
+                      case 0:
+                        info = null;
+
+                        if (!item.fetchInfo) {
+                          _context6.next = 5;
+                          break;
+                        }
 
-              return (_actionHandler$item$t3 = actionHandler[item.type]) === null || _actionHandler$item$t3 === void 0 ? void 0 : _actionHandler$item$t3.call(actionHandler, item, record, index);
-            }
+                        _context6.next = 4;
+                        return item.fetchInfo(record);
+
+                      case 4:
+                        info = _context6.sent;
+
+                      case 5:
+                        (_actionHandler$item$t3 = actionHandler[item.type]) === null || _actionHandler$item$t3 === void 0 ? void 0 : _actionHandler$item$t3.call(actionHandler, item, info || record, index);
+
+                      case 6:
+                      case "end":
+                        return _context6.stop();
+                    }
+                  }
+                }, _callee6);
+              }));
+
+              function onClick() {
+                return _onClick2.apply(this, arguments);
+              }
+
+              return onClick;
+            }()
           }, btn.icon, " ", btn.title));
         }
 
@@ -10975,17 +11045,17 @@ var TabelCard = function TabelCard(props, ref) {
               type: '新增',
               record: {},
               modalOnOk: function () {
-                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values, loading) {
-                  return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(values, loading) {
+                  return regeneratorRuntime.wrap(function _callee7$(_context7) {
                     while (1) {
-                      switch (_context5.prev = _context5.next) {
+                      switch (_context7.prev = _context7.next) {
                         case 0:
                           if (!item.actionMethod) {
-                            _context5.next = 3;
+                            _context7.next = 3;
                             break;
                           }
 
-                          _context5.next = 3;
+                          _context7.next = 3;
                           return item.actionMethod(values, function () {
                             var _actionRef$current4;
 
@@ -10995,10 +11065,10 @@ var TabelCard = function TabelCard(props, ref) {
 
                         case 3:
                         case "end":
-                          return _context5.stop();
+                          return _context7.stop();
                       }
                     }
-                  }, _callee5);
+                  }, _callee7);
                 }));
 
                 function modalOnOk(_x3, _x4) {
@@ -11027,14 +11097,14 @@ var TabelCard = function TabelCard(props, ref) {
   var onSubmit = function onSubmit(values) {
     var _actionRef$current6;
 
-    setFormSearch(values);
+    formSearchRef.current = values;
     actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload(true);
   };
 
   var onReset = function onReset() {
     var _actionRef$current7;
 
-    setFormSearch({});
+    formSearchRef.current = {};
     actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
   };
 
@@ -11050,7 +11120,13 @@ var TabelCard = function TabelCard(props, ref) {
       }).forEach(function (item) {
         delete obj[item.dataIndex];
       });
-      setFormSearch(obj);
+      formSearchRef.current = obj;
+
+      if (columns === null || columns === void 0 ? void 0 : columns.length) {
+        var _actionRef$current8;
+
+        actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : _actionRef$current8.reload(true);
+      }
     }
   }, [columns]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
@@ -11062,25 +11138,25 @@ var TabelCard = function TabelCard(props, ref) {
     disabled: modalFormConfig.type == '查看',
     setVisible: setVisible,
     submitMethod: function () {
-      var _submitMethod = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(values, loading) {
-        return regeneratorRuntime.wrap(function _callee6$(_context6) {
+      var _submitMethod = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(values, loading) {
+        return regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
                 if (!modalFormConfig.modalOnOk) {
-                  _context6.next = 3;
+                  _context8.next = 3;
                   break;
                 }
 
-                _context6.next = 3;
+                _context8.next = 3;
                 return modalFormConfig.modalOnOk(values, loading);
 
               case 3:
               case "end":
-                return _context6.stop();
+                return _context8.stop();
             }
           }
-        }, _callee6);
+        }, _callee8);
       }));
 
       function submitMethod(_x5, _x6) {
@@ -11122,7 +11198,7 @@ var TabelCard = function TabelCard(props, ref) {
 
       return true;
     })
-  })), /*#__PURE__*/React.createElement(WForm$1, {
+  })), /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
     ref: searchFormRef,
     disabledRuler: true,
     search: search == false ? {
@@ -11146,7 +11222,7 @@ var TabelCard = function TabelCard(props, ref) {
         return [].concat(_toConsumableArray(pre), [column]);
       }
     }, [])
-  }), /*#__PURE__*/React.createElement(ProTable, _objectSpread2(_objectSpread2({
+  }, searchFormConfig || {})), columns && columns.length && /*#__PURE__*/React.createElement(ProTable, _objectSpread2(_objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
     bordered: !noBordered,
@@ -11154,23 +11230,23 @@ var TabelCard = function TabelCard(props, ref) {
     toolBarRender: false
   }, _request ? {
     request: function () {
-      var _request2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(params) {
-        return regeneratorRuntime.wrap(function _callee7$(_context7) {
+      var _request2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(params) {
+        return regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
-                _context7.next = 2;
-                return _request(_objectSpread2(_objectSpread2({}, params), formSearch));
+                _context9.next = 2;
+                return _request(_objectSpread2(_objectSpread2({}, params), formSearchRef.current));
 
               case 2:
-                return _context7.abrupt("return", _context7.sent);
+                return _context9.abrupt("return", _context9.sent);
 
               case 3:
               case "end":
-                return _context7.stop();
+                return _context9.stop();
             }
           }
-        }, _callee7);
+        }, _callee9);
       }));
 
       function request(_x7) {

package/dist/index.js

@@ -7253,7 +7253,7 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm"];
+var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
 var RangePicker$2 = Index$6.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7269,6 +7269,7 @@ var WForm = function WForm(props, ref) {
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       setForm = props.setForm,
+      deps = props.deps,
       extraProps = _objectWithoutProperties(props, _excluded$7);
 
   var _Form$useForm = _Form__default['default'].useForm(),
@@ -7807,8 +7808,8 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
-  ]);
+  }, [changedValues, columns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
+  ]));
   var filterExtraColumnsForm = React.useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       if (c.type == 'group') {
@@ -7819,7 +7820,7 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]));
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();
@@ -10560,7 +10561,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
 }
 
-var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
+var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10577,6 +10578,9 @@ var ModalForm = function ModalForm(props, ref) {
       onFormChange = props.onFormChange,
       formItemChild = props.formItemChild,
       onCancel = props.onCancel,
+      modalHeaderSolt = props.modalHeaderSolt,
+      modalFooterSolt = props.modalFooterSolt,
+      formProps = props.formProps,
       extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var formRef = React.useRef(null);
@@ -10670,6 +10674,7 @@ var ModalForm = function ModalForm(props, ref) {
               _context2.next = 5;
               return submitMethod(values, function () {
                 setVisible(false);
+                onCancel && onCancel();
               });
 
             case 5:
@@ -10707,7 +10712,7 @@ var ModalForm = function ModalForm(props, ref) {
     onOk: handleOk,
     confirmLoading: confirmLoading,
     onCancel: handleCancel
-  }, extraProps), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
+  }, extraProps), modalHeaderSolt, /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
@@ -10717,12 +10722,12 @@ var ModalForm = function ModalForm(props, ref) {
     search: search,
     columns: columns,
     extraColumns: extraColumns
-  }), title == '查看' && formItemChild ? formItemChild() : null);
+  }, formProps || {})), title == '查看' && formItemChild ? formItemChild() : null, modalFooterSolt);
 };
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination", "noBordered"];
+var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10737,6 +10742,7 @@ var TabelCard = function TabelCard(props, ref) {
       style = props.style,
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
+      searchFormConfig = props.searchFormConfig,
       optionColumnConfig = props.optionColumnConfig,
       pagination = props.pagination,
       noBordered = props.noBordered,
@@ -10756,11 +10762,7 @@ var TabelCard = function TabelCard(props, ref) {
       modalFormConfig = _useState4[0],
       setModalFormConfig = _useState4[1];
 
-  var _useState5 = React.useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      formSearch = _useState6[0],
-      setFormSearch = _useState6[1];
-
+  var formSearchRef = React.useRef({});
   var modalFormColumn = deepCopy(columns) || [];
   var formSearchColumn = deepCopy(columns) || [];
   React.useImperativeHandle(ref, function () {
@@ -10955,11 +10957,45 @@ var TabelCard = function TabelCard(props, ref) {
             key: i
           }, /*#__PURE__*/React__default['default'].createElement("a", {
             key: btn.key,
-            onClick: function onClick() {
-              var _actionHandler$item$t;
+            onClick: function () {
+              var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+                var _actionHandler$item$t;
+
+                var info;
+                return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                  while (1) {
+                    switch (_context5.prev = _context5.next) {
+                      case 0:
+                        info = null;
+
+                        if (!item.fetchInfo) {
+                          _context5.next = 5;
+                          break;
+                        }
 
-              return (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, record, index);
-            }
+                        _context5.next = 4;
+                        return item.fetchInfo(record);
+
+                      case 4:
+                        info = _context5.sent;
+
+                      case 5:
+                        (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, info || record, index);
+
+                      case 6:
+                      case "end":
+                        return _context5.stop();
+                    }
+                  }
+                }, _callee5);
+              }));
+
+              function onClick() {
+                return _onClick.apply(this, arguments);
+              }
+
+              return onClick;
+            }()
           }, btn.icon, " ", btn.title));
         }
 
@@ -10978,11 +11014,45 @@ var TabelCard = function TabelCard(props, ref) {
             key: i
           }, /*#__PURE__*/React__default['default'].createElement("a", {
             key: btn.key,
-            onClick: function onClick() {
-              var _actionHandler$item$t3;
+            onClick: function () {
+              var _onClick2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+                var _actionHandler$item$t3;
+
+                var info;
+                return regeneratorRuntime.wrap(function _callee6$(_context6) {
+                  while (1) {
+                    switch (_context6.prev = _context6.next) {
+                      case 0:
+                        info = null;
+
+                        if (!item.fetchInfo) {
+                          _context6.next = 5;
+                          break;
+                        }
 
-              return (_actionHandler$item$t3 = actionHandler[item.type]) === null || _actionHandler$item$t3 === void 0 ? void 0 : _actionHandler$item$t3.call(actionHandler, item, record, index);
-            }
+                        _context6.next = 4;
+                        return item.fetchInfo(record);
+
+                      case 4:
+                        info = _context6.sent;
+
+                      case 5:
+                        (_actionHandler$item$t3 = actionHandler[item.type]) === null || _actionHandler$item$t3 === void 0 ? void 0 : _actionHandler$item$t3.call(actionHandler, item, info || record, index);
+
+                      case 6:
+                      case "end":
+                        return _context6.stop();
+                    }
+                  }
+                }, _callee6);
+              }));
+
+              function onClick() {
+                return _onClick2.apply(this, arguments);
+              }
+
+              return onClick;
+            }()
           }, btn.icon, " ", btn.title));
         }
 
@@ -11036,17 +11106,17 @@ var TabelCard = function TabelCard(props, ref) {
               type: '新增',
               record: {},
               modalOnOk: function () {
-                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values, loading) {
-                  return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(values, loading) {
+                  return regeneratorRuntime.wrap(function _callee7$(_context7) {
                     while (1) {
-                      switch (_context5.prev = _context5.next) {
+                      switch (_context7.prev = _context7.next) {
                         case 0:
                           if (!item.actionMethod) {
-                            _context5.next = 3;
+                            _context7.next = 3;
                             break;
                           }
 
-                          _context5.next = 3;
+                          _context7.next = 3;
                           return item.actionMethod(values, function () {
                             var _actionRef$current4;
 
@@ -11056,10 +11126,10 @@ var TabelCard = function TabelCard(props, ref) {
 
                         case 3:
                         case "end":
-                          return _context5.stop();
+                          return _context7.stop();
                       }
                     }
-                  }, _callee5);
+                  }, _callee7);
                 }));
 
                 function modalOnOk(_x3, _x4) {
@@ -11088,14 +11158,14 @@ var TabelCard = function TabelCard(props, ref) {
   var onSubmit = function onSubmit(values) {
     var _actionRef$current6;
 
-    setFormSearch(values);
+    formSearchRef.current = values;
     actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload(true);
   };
 
   var onReset = function onReset() {
     var _actionRef$current7;
 
-    setFormSearch({});
+    formSearchRef.current = {};
     actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
   };
 
@@ -11111,7 +11181,13 @@ var TabelCard = function TabelCard(props, ref) {
       }).forEach(function (item) {
         delete obj[item.dataIndex];
       });
-      setFormSearch(obj);
+      formSearchRef.current = obj;
+
+      if (columns === null || columns === void 0 ? void 0 : columns.length) {
+        var _actionRef$current8;
+
+        actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : _actionRef$current8.reload(true);
+      }
     }
   }, [columns]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
@@ -11123,25 +11199,25 @@ var TabelCard = function TabelCard(props, ref) {
     disabled: modalFormConfig.type == '查看',
     setVisible: setVisible,
     submitMethod: function () {
-      var _submitMethod = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(values, loading) {
-        return regeneratorRuntime.wrap(function _callee6$(_context6) {
+      var _submitMethod = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(values, loading) {
+        return regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
                 if (!modalFormConfig.modalOnOk) {
-                  _context6.next = 3;
+                  _context8.next = 3;
                   break;
                 }
 
-                _context6.next = 3;
+                _context8.next = 3;
                 return modalFormConfig.modalOnOk(values, loading);
 
               case 3:
               case "end":
-                return _context6.stop();
+                return _context8.stop();
             }
           }
-        }, _callee6);
+        }, _callee8);
       }));
 
       function submitMethod(_x5, _x6) {
@@ -11183,7 +11259,7 @@ var TabelCard = function TabelCard(props, ref) {
 
       return true;
     })
-  })), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
+  })), /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
     ref: searchFormRef,
     disabledRuler: true,
     search: search == false ? {
@@ -11207,7 +11283,7 @@ var TabelCard = function TabelCard(props, ref) {
         return [].concat(_toConsumableArray(pre), [column]);
       }
     }, [])
-  }), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
+  }, searchFormConfig || {})), columns && columns.length && /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
     bordered: !noBordered,
@@ -11215,23 +11291,23 @@ var TabelCard = function TabelCard(props, ref) {
     toolBarRender: false
   }, _request ? {
     request: function () {
-      var _request2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(params) {
-        return regeneratorRuntime.wrap(function _callee7$(_context7) {
+      var _request2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(params) {
+        return regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
-                _context7.next = 2;
-                return _request(_objectSpread2(_objectSpread2({}, params), formSearch));
+                _context9.next = 2;
+                return _request(_objectSpread2(_objectSpread2({}, params), formSearchRef.current));
 
               case 2:
-                return _context7.abrupt("return", _context7.sent);
+                return _context9.abrupt("return", _context9.sent);
 
               case 3:
               case "end":
-                return _context7.stop();
+                return _context9.stop();
             }
           }
-        }, _callee7);
+        }, _callee9);
       }));
 
       function request(_x7) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.5.27",
+  "version": "0.5.30",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",
@@ -85,4 +85,4 @@
     "react": "^16.12.0",
     "yorkie": "^2.0.0"
   }
-}
+}