wargerm 0.3.15 → 0.3.18

package/dist/index.esm.js

@@ -5,7 +5,7 @@ import _Dropdown from 'antd/es/dropdown';
 import 'antd/es/menu/style';
 import _Menu from 'antd/es/menu';
 import React, { useState, useEffect, useMemo, useImperativeHandle, useRef } from 'react';
-import { createFromIconfontCN, SearchOutlined, ReloadOutlined, CloseCircleOutlined, PlusOutlined, ExclamationCircleOutlined, MoreOutlined, EyeOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
+import { createFromIconfontCN, SearchOutlined, ReloadOutlined, CloseCircleOutlined, PlusOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import 'antd/es/input/style';
 import _Input from 'antd/es/input';
 import 'antd/es/input-number/style';
@@ -46,7 +46,7 @@ import _Breadcrumb from 'antd/es/breadcrumb';
 import ReactDOM from 'react-dom';
 import 'antd/es/modal/style';
 import _Modal from 'antd/es/modal';
-import ProTable, { TableDropdown } from '@ant-design/pro-table';
+import ProTable from '@ant-design/pro-table';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -729,7 +729,12 @@ var WSelect = function WSelect(props) {
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
   }, [JSON.stringify(resList), JSON.stringify(request), JSON.stringify(params || {})]);
-  return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
+  return /*#__PURE__*/React.createElement(_Select, _objectSpread2({
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    }
+  }, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
 WSelect.defaultProps = {};
@@ -6622,6 +6627,8 @@ var TreeSelect = function TreeSelect(_ref) {
     }))();
   }, []);
   return /*#__PURE__*/React.createElement(_TreeSelect, _objectSpread2({
+    showSearch: true,
+    treeNodeFilterProp: "title",
     treeDefaultExpandAll: true
   }, props), !props.children ? renderTree(treeData) : props.children);
 };
@@ -10032,7 +10039,7 @@ var ModalForm = function ModalForm(props, ref) {
 
   useImperativeHandle(ref, function () {
     return {
-      formRef: formRef,
+      formRef: formRef.current,
       onSubmit: onSubmit
     };
   });
@@ -10128,8 +10135,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$h = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination"],
-    _excluded2$3 = ["actionMethod"];
+var _excluded$h = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10148,7 +10154,8 @@ var TabelCard = function TabelCard(props, ref) {
       extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var actionRef = useRef();
-  var formRef = useRef(null);
+  var modalFormRef = useRef(null);
+  var searchFormRef = useRef(null);
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -10168,7 +10175,8 @@ var TabelCard = function TabelCard(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       actionRef: actionRef.current,
-      formRef: formRef.current
+      modalFormRef: modalFormRef.current,
+      searchFormRef: searchFormRef.current
     };
   });
 
@@ -10312,67 +10320,6 @@ var TabelCard = function TabelCard(props, ref) {
           }
         }, _callee4);
       })), index);
-    },
-    more: function more(item, record, index) {
-      var menus = !item.subMenus ? [] : item.subMenus.map(function (b) {
-        var btn = actionConfig[b.key];
-
-        if (btn) {
-          b.name = btn.title;
-          b.icon = btn.icon;
-        }
-
-        return b;
-      });
-
-      var selectHandler = function selectHandler(key, item, record, index) {
-        var _item$actionMethod;
-
-        if (key == 'more') {
-          // No more recursion
-          return;
-        }
-
-        var customMenu = menus.find(function (m) {
-          return m.key === key;
-        });
-
-        var _item = _objectSpread2(_objectSpread2({}, customMenu), {}, {
-          type: key
-        });
-
-        var handler = actionHandler[key];
-
-        if (handler) {
-          return handler(_item, record, index);
-        }
-
-        return (_item$actionMethod = _item.actionMethod) === null || _item$actionMethod === void 0 ? void 0 : _item$actionMethod.call(_item, record, function () {
-          var _actionRef$current4;
-
-          actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
-        });
-      };
-
-      var m = _toConsumableArray(menus).map(function (e) {
-        if (!('actionMethod' in e)) {
-          return e;
-        }
-
-        var actionMethod = e.actionMethod,
-            b = _objectWithoutProperties(e, _excluded2$3);
-
-        return _objectSpread2({}, b);
-      });
-
-      return /*#__PURE__*/React.createElement(TableDropdown, {
-        key: "actionGroup",
-        children: /*#__PURE__*/React.createElement(MoreOutlined, null),
-        menus: m,
-        onSelect: function onSelect(key) {
-          return selectHandler(key, item, record, index);
-        }
-      });
     }
   };
   var actionConfig = {
@@ -10394,27 +10341,86 @@ var TabelCard = function TabelCard(props, ref) {
   };
 
   var tableActionDom = function tableActionDom(record, index) {
-    return tableAction === null || tableAction === void 0 ? void 0 : tableAction.map(function (item) {
-      var _actionHandler$item$t2;
+    var showMoreNum = (optionColumnConfig === null || optionColumnConfig === void 0 ? void 0 : optionColumnConfig.showMoreNum) || 0;
 
-      var btn = actionConfig[item.type];
+    if (tableAction && showMoreNum > 0 && showMoreNum < tableAction.length) {
+      var tableAction1 = tableAction.slice(0, showMoreNum);
+      var tableAction2 = tableAction.slice(showMoreNum);
+      var menu = /*#__PURE__*/React.createElement(_Menu, null, tableAction2.map(function (item, i) {
+        var _actionHandler$item$t2;
 
-      if (btn) {
-        return /*#__PURE__*/React.createElement(_Tooltip, {
-          title: btn.title,
-          key: btn.key
-        }, /*#__PURE__*/React.createElement("a", {
-          key: btn.key,
-          onClick: function onClick() {
-            var _actionHandler$item$t;
+        var btn = actionConfig[item.type];
 
-            return (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, record, index);
-          }
-        }, btn.icon, " ", btn.title));
-      }
+        if (btn) {
+          return /*#__PURE__*/React.createElement(_Menu.Item, {
+            key: i
+          }, /*#__PURE__*/React.createElement("a", {
+            key: btn.key,
+            onClick: function onClick() {
+              var _actionHandler$item$t;
+
+              return (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, record, index);
+            }
+          }, btn.icon, " ", btn.title));
+        }
 
-      return (_actionHandler$item$t2 = actionHandler[item.type]) === null || _actionHandler$item$t2 === void 0 ? void 0 : _actionHandler$item$t2.call(actionHandler, item, record, index);
-    });
+        return /*#__PURE__*/React.createElement(_Menu.Item, {
+          key: i
+        }, (_actionHandler$item$t2 = actionHandler[item.type]) === null || _actionHandler$item$t2 === void 0 ? void 0 : _actionHandler$item$t2.call(actionHandler, item, record, index));
+      }));
+      return [].concat(_toConsumableArray(tableAction1.map(function (item, i) {
+        var _actionHandler$item$t4;
+
+        var btn = actionConfig[item.type];
+
+        if (btn) {
+          return /*#__PURE__*/React.createElement(_Tooltip, {
+            title: btn.title,
+            key: i
+          }, /*#__PURE__*/React.createElement("a", {
+            key: btn.key,
+            onClick: function onClick() {
+              var _actionHandler$item$t3;
+
+              return (_actionHandler$item$t3 = actionHandler[item.type]) === null || _actionHandler$item$t3 === void 0 ? void 0 : _actionHandler$item$t3.call(actionHandler, item, record, index);
+            }
+          }, btn.icon, " ", btn.title));
+        }
+
+        return /*#__PURE__*/React.createElement("span", {
+          key: i
+        }, (_actionHandler$item$t4 = actionHandler[item.type]) === null || _actionHandler$item$t4 === void 0 ? void 0 : _actionHandler$item$t4.call(actionHandler, item, record, index));
+      })), [/*#__PURE__*/React.createElement(_Dropdown, {
+        overlay: menu,
+        key: 'more'
+      }, /*#__PURE__*/React.createElement("a", {
+        key: "more"
+      }, /*#__PURE__*/React.createElement(EllipsisOutlined, null)))]);
+    } else {
+      return tableAction === null || tableAction === void 0 ? void 0 : tableAction.map(function (item, i) {
+        var _actionHandler$item$t6;
+
+        var btn = actionConfig[item.type];
+
+        if (btn) {
+          return /*#__PURE__*/React.createElement(_Tooltip, {
+            title: btn.title,
+            key: i
+          }, /*#__PURE__*/React.createElement("a", {
+            key: btn.key,
+            onClick: function onClick() {
+              var _actionHandler$item$t5;
+
+              return (_actionHandler$item$t5 = actionHandler[item.type]) === null || _actionHandler$item$t5 === void 0 ? void 0 : _actionHandler$item$t5.call(actionHandler, item, record, index);
+            }
+          }, btn.icon, " ", btn.title));
+        }
+
+        return /*#__PURE__*/React.createElement("span", {
+          key: i
+        }, (_actionHandler$item$t6 = actionHandler[item.type]) === null || _actionHandler$item$t6 === void 0 ? void 0 : _actionHandler$item$t6.call(actionHandler, item, record, index));
+      });
+    }
   };
 
   var tableBarDom = useMemo(function () {
@@ -10443,10 +10449,10 @@ var TabelCard = function TabelCard(props, ref) {
 
                           _context5.next = 3;
                           return item.actionMethod(values, function () {
-                            var _actionRef$current5;
+                            var _actionRef$current4;
 
                             loading();
-                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.reload();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
                           });
 
                         case 3:
@@ -10471,9 +10477,9 @@ var TabelCard = function TabelCard(props, ref) {
 
         return (_item$actionRender2 = item.actionRender) === null || _item$actionRender2 === void 0 ? void 0 : _item$actionRender2.call(item, actionRef, function () {
           item.actionMethod && item.actionMethod(actionRef, function () {
-            var _actionRef$current6;
+            var _actionRef$current5;
 
-            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload();
+            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.reload();
           });
         });
       }
@@ -10481,22 +10487,22 @@ var TabelCard = function TabelCard(props, ref) {
   }, [actionRef]);
 
   var onSubmit = function onSubmit(values) {
-    var _actionRef$current7;
+    var _actionRef$current6;
 
     setFormSearch(values);
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload();
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload();
   };
 
   var onReset = function onReset() {
-    var _actionRef$current8;
+    var _actionRef$current7;
 
     setFormSearch({});
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : _actionRef$current8.reload();
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload();
   };
 
   var formSearchColumn = columns || [];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
-    ref: formRef,
+    ref: modalFormRef,
     title: modalFormConfig.type || '新增',
     visible: visible,
     record: modalFormConfig.record,
@@ -10550,7 +10556,7 @@ var TabelCard = function TabelCard(props, ref) {
       return true;
     })
   })), /*#__PURE__*/React.createElement(WForm$1, {
-    ref: ref,
+    ref: searchFormRef,
     search: _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',

package/dist/index.js

@@ -763,7 +763,12 @@ var WSelect = function WSelect(props) {
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
   }, [JSON.stringify(resList), JSON.stringify(request), JSON.stringify(params || {})]);
-  return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
+  return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    }
+  }, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
 WSelect.defaultProps = {};
@@ -6656,6 +6661,8 @@ var TreeSelect = function TreeSelect(_ref) {
     }))();
   }, []);
   return /*#__PURE__*/React__default['default'].createElement(_TreeSelect__default['default'], _objectSpread2({
+    showSearch: true,
+    treeNodeFilterProp: "title",
     treeDefaultExpandAll: true
   }, props), !props.children ? renderTree(treeData) : props.children);
 };
@@ -10066,7 +10073,7 @@ var ModalForm = function ModalForm(props, ref) {
 
   React.useImperativeHandle(ref, function () {
     return {
-      formRef: formRef,
+      formRef: formRef.current,
       onSubmit: onSubmit
     };
   });
@@ -10162,8 +10169,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$h = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination"],
-    _excluded2$3 = ["actionMethod"];
+var _excluded$h = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10182,7 +10188,8 @@ var TabelCard = function TabelCard(props, ref) {
       extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var actionRef = React.useRef();
-  var formRef = React.useRef(null);
+  var modalFormRef = React.useRef(null);
+  var searchFormRef = React.useRef(null);
 
   var _useState = React.useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -10202,7 +10209,8 @@ var TabelCard = function TabelCard(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       actionRef: actionRef.current,
-      formRef: formRef.current
+      modalFormRef: modalFormRef.current,
+      searchFormRef: searchFormRef.current
     };
   });
 
@@ -10346,67 +10354,6 @@ var TabelCard = function TabelCard(props, ref) {
           }
         }, _callee4);
       })), index);
-    },
-    more: function more(item, record, index) {
-      var menus = !item.subMenus ? [] : item.subMenus.map(function (b) {
-        var btn = actionConfig[b.key];
-
-        if (btn) {
-          b.name = btn.title;
-          b.icon = btn.icon;
-        }
-
-        return b;
-      });
-
-      var selectHandler = function selectHandler(key, item, record, index) {
-        var _item$actionMethod;
-
-        if (key == 'more') {
-          // No more recursion
-          return;
-        }
-
-        var customMenu = menus.find(function (m) {
-          return m.key === key;
-        });
-
-        var _item = _objectSpread2(_objectSpread2({}, customMenu), {}, {
-          type: key
-        });
-
-        var handler = actionHandler[key];
-
-        if (handler) {
-          return handler(_item, record, index);
-        }
-
-        return (_item$actionMethod = _item.actionMethod) === null || _item$actionMethod === void 0 ? void 0 : _item$actionMethod.call(_item, record, function () {
-          var _actionRef$current4;
-
-          actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
-        });
-      };
-
-      var m = _toConsumableArray(menus).map(function (e) {
-        if (!('actionMethod' in e)) {
-          return e;
-        }
-
-        var actionMethod = e.actionMethod,
-            b = _objectWithoutProperties(e, _excluded2$3);
-
-        return _objectSpread2({}, b);
-      });
-
-      return /*#__PURE__*/React__default['default'].createElement(ProTable.TableDropdown, {
-        key: "actionGroup",
-        children: /*#__PURE__*/React__default['default'].createElement(icons.MoreOutlined, null),
-        menus: m,
-        onSelect: function onSelect(key) {
-          return selectHandler(key, item, record, index);
-        }
-      });
     }
   };
   var actionConfig = {
@@ -10428,27 +10375,86 @@ var TabelCard = function TabelCard(props, ref) {
   };
 
   var tableActionDom = function tableActionDom(record, index) {
-    return tableAction === null || tableAction === void 0 ? void 0 : tableAction.map(function (item) {
-      var _actionHandler$item$t2;
+    var showMoreNum = (optionColumnConfig === null || optionColumnConfig === void 0 ? void 0 : optionColumnConfig.showMoreNum) || 0;
 
-      var btn = actionConfig[item.type];
+    if (tableAction && showMoreNum > 0 && showMoreNum < tableAction.length) {
+      var tableAction1 = tableAction.slice(0, showMoreNum);
+      var tableAction2 = tableAction.slice(showMoreNum);
+      var menu = /*#__PURE__*/React__default['default'].createElement(_Menu__default['default'], null, tableAction2.map(function (item, i) {
+        var _actionHandler$item$t2;
 
-      if (btn) {
-        return /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-          title: btn.title,
-          key: btn.key
-        }, /*#__PURE__*/React__default['default'].createElement("a", {
-          key: btn.key,
-          onClick: function onClick() {
-            var _actionHandler$item$t;
+        var btn = actionConfig[item.type];
 
-            return (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, record, index);
-          }
-        }, btn.icon, " ", btn.title));
-      }
+        if (btn) {
+          return /*#__PURE__*/React__default['default'].createElement(_Menu__default['default'].Item, {
+            key: i
+          }, /*#__PURE__*/React__default['default'].createElement("a", {
+            key: btn.key,
+            onClick: function onClick() {
+              var _actionHandler$item$t;
+
+              return (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, record, index);
+            }
+          }, btn.icon, " ", btn.title));
+        }
 
-      return (_actionHandler$item$t2 = actionHandler[item.type]) === null || _actionHandler$item$t2 === void 0 ? void 0 : _actionHandler$item$t2.call(actionHandler, item, record, index);
-    });
+        return /*#__PURE__*/React__default['default'].createElement(_Menu__default['default'].Item, {
+          key: i
+        }, (_actionHandler$item$t2 = actionHandler[item.type]) === null || _actionHandler$item$t2 === void 0 ? void 0 : _actionHandler$item$t2.call(actionHandler, item, record, index));
+      }));
+      return [].concat(_toConsumableArray(tableAction1.map(function (item, i) {
+        var _actionHandler$item$t4;
+
+        var btn = actionConfig[item.type];
+
+        if (btn) {
+          return /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
+            title: btn.title,
+            key: i
+          }, /*#__PURE__*/React__default['default'].createElement("a", {
+            key: btn.key,
+            onClick: function onClick() {
+              var _actionHandler$item$t3;
+
+              return (_actionHandler$item$t3 = actionHandler[item.type]) === null || _actionHandler$item$t3 === void 0 ? void 0 : _actionHandler$item$t3.call(actionHandler, item, record, index);
+            }
+          }, btn.icon, " ", btn.title));
+        }
+
+        return /*#__PURE__*/React__default['default'].createElement("span", {
+          key: i
+        }, (_actionHandler$item$t4 = actionHandler[item.type]) === null || _actionHandler$item$t4 === void 0 ? void 0 : _actionHandler$item$t4.call(actionHandler, item, record, index));
+      })), [/*#__PURE__*/React__default['default'].createElement(_Dropdown__default['default'], {
+        overlay: menu,
+        key: 'more'
+      }, /*#__PURE__*/React__default['default'].createElement("a", {
+        key: "more"
+      }, /*#__PURE__*/React__default['default'].createElement(icons.EllipsisOutlined, null)))]);
+    } else {
+      return tableAction === null || tableAction === void 0 ? void 0 : tableAction.map(function (item, i) {
+        var _actionHandler$item$t6;
+
+        var btn = actionConfig[item.type];
+
+        if (btn) {
+          return /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
+            title: btn.title,
+            key: i
+          }, /*#__PURE__*/React__default['default'].createElement("a", {
+            key: btn.key,
+            onClick: function onClick() {
+              var _actionHandler$item$t5;
+
+              return (_actionHandler$item$t5 = actionHandler[item.type]) === null || _actionHandler$item$t5 === void 0 ? void 0 : _actionHandler$item$t5.call(actionHandler, item, record, index);
+            }
+          }, btn.icon, " ", btn.title));
+        }
+
+        return /*#__PURE__*/React__default['default'].createElement("span", {
+          key: i
+        }, (_actionHandler$item$t6 = actionHandler[item.type]) === null || _actionHandler$item$t6 === void 0 ? void 0 : _actionHandler$item$t6.call(actionHandler, item, record, index));
+      });
+    }
   };
 
   var tableBarDom = React.useMemo(function () {
@@ -10477,10 +10483,10 @@ var TabelCard = function TabelCard(props, ref) {
 
                           _context5.next = 3;
                           return item.actionMethod(values, function () {
-                            var _actionRef$current5;
+                            var _actionRef$current4;
 
                             loading();
-                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.reload();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
                           });
 
                         case 3:
@@ -10505,9 +10511,9 @@ var TabelCard = function TabelCard(props, ref) {
 
         return (_item$actionRender2 = item.actionRender) === null || _item$actionRender2 === void 0 ? void 0 : _item$actionRender2.call(item, actionRef, function () {
           item.actionMethod && item.actionMethod(actionRef, function () {
-            var _actionRef$current6;
+            var _actionRef$current5;
 
-            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload();
+            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.reload();
           });
         });
       }
@@ -10515,22 +10521,22 @@ var TabelCard = function TabelCard(props, ref) {
   }, [actionRef]);
 
   var onSubmit = function onSubmit(values) {
-    var _actionRef$current7;
+    var _actionRef$current6;
 
     setFormSearch(values);
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload();
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload();
   };
 
   var onReset = function onReset() {
-    var _actionRef$current8;
+    var _actionRef$current7;
 
     setFormSearch({});
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : _actionRef$current8.reload();
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload();
   };
 
   var formSearchColumn = columns || [];
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
-    ref: formRef,
+    ref: modalFormRef,
     title: modalFormConfig.type || '新增',
     visible: visible,
     record: modalFormConfig.record,
@@ -10584,7 +10590,7 @@ var TabelCard = function TabelCard(props, ref) {
       return true;
     })
   })), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
-    ref: ref,
+    ref: searchFormRef,
     search: _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.3.15",
+  "version": "0.3.18",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",