wargerm 0.3.17 → 0.3.20

package/dist/components/Modal/dialog.d.ts

@@ -9,6 +9,7 @@ declare type Props = {
     onClose?: () => void;
     okText?: string;
     cancelText?: string;
+    destroyOnClose?: boolean;
     visible?: boolean;
     width?: number;
     className?: string;

package/dist/index.css

@@ -1211,7 +1211,7 @@ div.ant-picker.ant-picker-focused {
   align-items: baseline;
 }
 .autoScroll-outer {
-  overflow: hidden;
+  overflow: auto;
   height: 100px;
 }
 @font-face {

package/dist/index.esm.css

@@ -1211,7 +1211,7 @@ div.ant-picker.ant-picker-focused {
   align-items: baseline;
 }
 .autoScroll-outer {
-  overflow: hidden;
+  overflow: auto;
   height: 100px;
 }
 @font-face {

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);
@@ -9506,6 +9506,7 @@ var controlShow = function controlShow(f1, f2, value, timer) {
 function DialogModel(props) {
   var width = props.width,
       visible = props.visible,
+      destroyOnClose = props.destroyOnClose,
       closeCb = props.closeCb,
       onClose = props.onClose,
       _props$className = props.className,
@@ -9527,6 +9528,16 @@ function DialogModel(props) {
       flag = _useState6[0],
       setFlag = _useState6[1];
 
+  var _useState7 = useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      hasVisit = _useState8[0],
+      setHasVisit = _useState8[1];
+
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isDesChild = _useState10[0],
+      setIsDesChild = _useState10[1];
+
   var renderChildren = useMemo(function () {
     var _classNames;
 
@@ -9552,16 +9563,16 @@ function DialogModel(props) {
         height: '100%',
         position: 'relative'
       }
-    }, props.children))), /*#__PURE__*/React.createElement("div", {
+    }, isDesChild ? null : props.children))), /*#__PURE__*/React.createElement("div", {
       className: 'mask',
       onClick: function onClick() {
-        return onClose && onClose();
+        onClose && onClose();
       },
       style: {
         opacity: modelShowAync ? 0.6 : 0
       }
     })), document.body);
-  }, [modelShowAync, modelShow, props]);
+  }, [modelShowAync, modelShow, props, isDesChild]);
   useEffect(function () {
     var timer;
     setFlag(visible);
@@ -9577,12 +9588,25 @@ function DialogModel(props) {
     };
   }, [visible]);
   useEffect(function () {
+    if (modelShow) {
+      setHasVisit(true);
+    }
+
+    if (destroyOnClose && hasVisit) {
+      if (!modelShow) {
+        setIsDesChild(true);
+      } else {
+        setIsDesChild(false);
+      }
+    }
+
     !modelShow && typeof closeCb === 'function' && closeCb();
-  }, [modelShow]);
+  }, [modelShow, hasVisit, destroyOnClose]);
   return renderChildren;
 }
 
-var _excluded$e = ["visible"];
+var _excluded$e = ["visible", "width", "closeCb", "onClose", "className", "style"],
+    _excluded2$3 = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -9661,15 +9685,17 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           closeCb = _this$props4.closeCb,
           onClose = _this$props4.onClose,
           className = _this$props4.className,
-          style = _this$props4.style;
-      return /*#__PURE__*/React.createElement(DialogModel, {
+          style = _this$props4.style,
+          other = _objectWithoutProperties(_this$props4, _excluded$e);
+
+      return /*#__PURE__*/React.createElement(DialogModel, _objectSpread2({
         closeCb: closeCb,
         onClose: onClose,
         visible: visible,
         width: width,
         className: className,
         style: style
-      }, this.renderTop(), /*#__PURE__*/React.createElement("div", {
+      }, other), this.renderTop(), /*#__PURE__*/React.createElement("div", {
         className: "model-content"
       }, /*#__PURE__*/React.createElement("div", {
         className: "model-content-in"
@@ -9716,7 +9742,7 @@ Modal.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$e);
+        trueProps = _objectWithoutProperties(props, _excluded2$3);
 
     useEffect(function () {
       manager.mounted = true;
@@ -10039,7 +10065,7 @@ var ModalForm = function ModalForm(props, ref) {
 
   useImperativeHandle(ref, function () {
     return {
-      formRef: formRef,
+      formRef: formRef.current,
       onSubmit: onSubmit
     };
   });
@@ -10135,8 +10161,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,
@@ -10155,7 +10180,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),
@@ -10175,7 +10201,8 @@ var TabelCard = function TabelCard(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       actionRef: actionRef.current,
-      formRef: formRef.current
+      modalFormRef: modalFormRef.current,
+      searchFormRef: searchFormRef.current
     };
   });
 
@@ -10319,67 +10346,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 = {
@@ -10401,27 +10367,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 () {
@@ -10450,10 +10475,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:
@@ -10478,9 +10503,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();
           });
         });
       }
@@ -10488,22 +10513,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,
@@ -10557,8 +10582,10 @@ var TabelCard = function TabelCard(props, ref) {
       return true;
     })
   })), /*#__PURE__*/React.createElement(WForm$1, {
-    ref: ref,
-    search: _objectSpread2(_objectSpread2({
+    ref: searchFormRef,
+    search: search == false ? {
+      hideSubmit: true
+    } : _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',
       span: 6

package/dist/index.js

@@ -9540,6 +9540,7 @@ var controlShow = function controlShow(f1, f2, value, timer) {
 function DialogModel(props) {
   var width = props.width,
       visible = props.visible,
+      destroyOnClose = props.destroyOnClose,
       closeCb = props.closeCb,
       onClose = props.onClose,
       _props$className = props.className,
@@ -9561,6 +9562,16 @@ function DialogModel(props) {
       flag = _useState6[0],
       setFlag = _useState6[1];
 
+  var _useState7 = React.useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      hasVisit = _useState8[0],
+      setHasVisit = _useState8[1];
+
+  var _useState9 = React.useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isDesChild = _useState10[0],
+      setIsDesChild = _useState10[1];
+
   var renderChildren = React.useMemo(function () {
     var _classNames;
 
@@ -9586,16 +9597,16 @@ function DialogModel(props) {
         height: '100%',
         position: 'relative'
       }
-    }, props.children))), /*#__PURE__*/React__default['default'].createElement("div", {
+    }, isDesChild ? null : props.children))), /*#__PURE__*/React__default['default'].createElement("div", {
       className: 'mask',
       onClick: function onClick() {
-        return onClose && onClose();
+        onClose && onClose();
       },
       style: {
         opacity: modelShowAync ? 0.6 : 0
       }
     })), document.body);
-  }, [modelShowAync, modelShow, props]);
+  }, [modelShowAync, modelShow, props, isDesChild]);
   React.useEffect(function () {
     var timer;
     setFlag(visible);
@@ -9611,12 +9622,25 @@ function DialogModel(props) {
     };
   }, [visible]);
   React.useEffect(function () {
+    if (modelShow) {
+      setHasVisit(true);
+    }
+
+    if (destroyOnClose && hasVisit) {
+      if (!modelShow) {
+        setIsDesChild(true);
+      } else {
+        setIsDesChild(false);
+      }
+    }
+
     !modelShow && typeof closeCb === 'function' && closeCb();
-  }, [modelShow]);
+  }, [modelShow, hasVisit, destroyOnClose]);
   return renderChildren;
 }
 
-var _excluded$e = ["visible"];
+var _excluded$e = ["visible", "width", "closeCb", "onClose", "className", "style"],
+    _excluded2$3 = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -9695,15 +9719,17 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           closeCb = _this$props4.closeCb,
           onClose = _this$props4.onClose,
           className = _this$props4.className,
-          style = _this$props4.style;
-      return /*#__PURE__*/React__default['default'].createElement(DialogModel, {
+          style = _this$props4.style,
+          other = _objectWithoutProperties(_this$props4, _excluded$e);
+
+      return /*#__PURE__*/React__default['default'].createElement(DialogModel, _objectSpread2({
         closeCb: closeCb,
         onClose: onClose,
         visible: visible,
         width: width,
         className: className,
         style: style
-      }, this.renderTop(), /*#__PURE__*/React__default['default'].createElement("div", {
+      }, other), this.renderTop(), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-content"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-content-in"
@@ -9750,7 +9776,7 @@ Modal.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$e);
+        trueProps = _objectWithoutProperties(props, _excluded2$3);
 
     React.useEffect(function () {
       manager.mounted = true;
@@ -10073,7 +10099,7 @@ var ModalForm = function ModalForm(props, ref) {
 
   React.useImperativeHandle(ref, function () {
     return {
-      formRef: formRef,
+      formRef: formRef.current,
       onSubmit: onSubmit
     };
   });
@@ -10169,8 +10195,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,
@@ -10189,7 +10214,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),
@@ -10209,7 +10235,8 @@ var TabelCard = function TabelCard(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       actionRef: actionRef.current,
-      formRef: formRef.current
+      modalFormRef: modalFormRef.current,
+      searchFormRef: searchFormRef.current
     };
   });
 
@@ -10353,67 +10380,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 = {
@@ -10435,27 +10401,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 () {
@@ -10484,10 +10509,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:
@@ -10512,9 +10537,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();
           });
         });
       }
@@ -10522,22 +10547,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,
@@ -10591,8 +10616,10 @@ var TabelCard = function TabelCard(props, ref) {
       return true;
     })
   })), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
-    ref: ref,
-    search: _objectSpread2(_objectSpread2({
+    ref: searchFormRef,
+    search: search == false ? {
+      hideSubmit: true
+    } : _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',
       span: 6

package/package.json

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