wargerm 0.2.17 → 0.2.21

package/dist/index.js

@@ -562,41 +562,39 @@ var WSelect = function WSelect(props) {
       setResList = _useState6[1];
 
   React.useEffect(function () {
-    if (!resList) {
-      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var res, node;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!request) {
-                  _context.next = 8;
-                  break;
-                }
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var res, node;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!request) {
+                _context.next = 8;
+                break;
+              }
 
-                _context.next = 3;
-                return request();
+              _context.next = 3;
+              return request();
 
-              case 3:
-                res = _context.sent;
-                setResList(res);
-                onLoad && onLoad(res);
-                node = res.map(function (item) {
-                  return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
-                    key: item.value,
-                    value: item.value
-                  }, item.label);
-                });
-                setChildrenNode(node);
+            case 3:
+              res = _context.sent;
+              setResList(res);
+              onLoad && onLoad(res);
+              node = res.map(function (item) {
+                return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
+                  key: item.value,
+                  value: item.value
+                }, item.label);
+              });
+              setChildrenNode(node);
 
-              case 8:
-              case "end":
-                return _context.stop();
-            }
+            case 8:
+            case "end":
+              return _context.stop();
           }
-        }, _callee);
-      }))();
-    }
+        }
+      }, _callee);
+    }))();
 
     var valueEnumNode = [];
     var options = [];
@@ -626,7 +624,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [resList]);
+  }, [JSON.stringify(resList)]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -9234,7 +9232,9 @@ function invariant(condition, message) {
     if (isProduction$1) {
         throw new Error(prefix);
     }
-    throw new Error(prefix + ": " + (message || ''));
+    var provided = typeof message === 'function' ? message() : message;
+    var value = provided ? prefix + ": " + provided : prefix;
+    throw new Error(value);
 }
 
 function addLeadingSlash(path) {
@@ -10152,7 +10152,8 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$f = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
+var _excluded$f = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"],
+    _excluded2$3 = ["actionMethod"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10193,164 +10194,243 @@ var TabelCard = function TabelCard(props, ref) {
     setModalFormConfig(options);
   };
 
-  var tableActionDom = function tableActionDom(record, index) {
-    return tableAction === null || tableAction === void 0 ? void 0 : tableAction.map(function (item) {
-      if (item.type === 'edit') {
-        return /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-          title: "\u7F16\u8F91",
-          key: "edit"
-        }, /*#__PURE__*/React__default['default'].createElement("a", {
-          key: "editable",
-          onClick: function onClick() {
-            return openFormModel({
-              type: '编辑',
-              record: record,
-              modalOnOk: function () {
-                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values, loading) {
-                  return regeneratorRuntime.wrap(function _callee$(_context) {
-                    while (1) {
-                      switch (_context.prev = _context.next) {
-                        case 0:
-                          if (!item.actionMethod) {
-                            _context.next = 3;
-                            break;
-                          }
-
-                          _context.next = 3;
-                          return item.actionMethod(values, function () {
-                            var _actionRef$current;
+  var actionHandler = {
+    view: function view(item, record, index) {
+      openFormModel({
+        type: '查看',
+        record: record,
+        modalOnOk: function () {
+          var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+            return regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
 
-                            loading();
-                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
-                          }, record);
+          function modalOnOk() {
+            return _modalOnOk.apply(this, arguments);
+          }
 
-                        case 3:
-                        case "end":
-                          return _context.stop();
-                      }
+          return modalOnOk;
+        }(),
+        index: index
+      });
+    },
+    edit: function edit(item, record, index) {
+      openFormModel({
+        type: '编辑',
+        record: record,
+        modalOnOk: function () {
+          var _modalOnOk2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values, loading) {
+            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    if (!item.actionMethod) {
+                      _context2.next = 3;
+                      break;
                     }
-                  }, _callee);
-                }));
 
-                function modalOnOk(_x, _x2) {
-                  return _modalOnOk.apply(this, arguments);
-                }
+                    _context2.next = 3;
+                    return item.actionMethod(values, function () {
+                      var _actionRef$current;
 
-                return modalOnOk;
-              }(),
-              index: index
-            });
-          }
-        }, /*#__PURE__*/React__default['default'].createElement(icons.EditOutlined, null), " \u7F16\u8F91"));
-      } else if (item.type === 'view') {
-        return /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-          title: "\u67E5\u770B",
-          key: "view"
-        }, /*#__PURE__*/React__default['default'].createElement("a", {
-          onClick: function onClick() {
-            return openFormModel({
-              type: '查看',
-              record: record,
-              modalOnOk: function () {
-                var _modalOnOk2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-                  return regeneratorRuntime.wrap(function _callee2$(_context2) {
-                    while (1) {
-                      switch (_context2.prev = _context2.next) {
-                        case 0:
-                        case "end":
-                          return _context2.stop();
-                      }
-                    }
-                  }, _callee2);
-                }));
+                      loading();
+                      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
+                    }, record);
 
-                function modalOnOk() {
-                  return _modalOnOk2.apply(this, arguments);
+                  case 3:
+                  case "end":
+                    return _context2.stop();
                 }
+              }
+            }, _callee2);
+          }));
 
-                return modalOnOk;
-              }(),
-              index: index
-            });
-          },
-          key: "view"
-        }, /*#__PURE__*/React__default['default'].createElement(icons.EyeOutlined, null), " \u67E5\u770B"));
-      } else if (item.type === 'delete') {
-        return /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-          title: "\u5220\u9664",
-          key: "delete"
-        }, /*#__PURE__*/React__default['default'].createElement("a", {
-          onClick: function onClick() {
-            return _Modal__default['default'].confirm({
-              title: '删除',
-              icon: /*#__PURE__*/React__default['default'].createElement(icons.ExclamationCircleOutlined, null),
-              content: '是否确定要删除吗？',
-              okText: '确认',
-              cancelText: '取消',
-              onOk: function () {
-                var _onOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-                  return regeneratorRuntime.wrap(function _callee3$(_context3) {
-                    while (1) {
-                      switch (_context3.prev = _context3.next) {
-                        case 0:
-                          if (!item.actionMethod) {
-                            _context3.next = 3;
-                            break;
-                          }
+          function modalOnOk(_x, _x2) {
+            return _modalOnOk2.apply(this, arguments);
+          }
 
-                          _context3.next = 3;
-                          return item.actionMethod(record, function () {
-                            var _actionRef$current2;
+          return modalOnOk;
+        }(),
+        index: index
+      });
+    },
+    delete: function _delete(item, record, index) {
+      _Modal__default['default'].confirm({
+        title: '删除',
+        icon: /*#__PURE__*/React__default['default'].createElement(icons.ExclamationCircleOutlined, null),
+        content: '是否确定要删除吗？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: function () {
+          var _onOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+            return regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) {
+                switch (_context3.prev = _context3.next) {
+                  case 0:
+                    if (!item.actionMethod) {
+                      _context3.next = 3;
+                      break;
+                    }
 
-                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.reload();
-                          });
+                    _context3.next = 3;
+                    return item.actionMethod(record, function () {
+                      var _actionRef$current2;
 
-                        case 3:
-                        case "end":
-                          return _context3.stop();
-                      }
-                    }
-                  }, _callee3);
-                }));
+                      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.reload();
+                    });
 
-                function onOk() {
-                  return _onOk.apply(this, arguments);
+                  case 3:
+                  case "end":
+                    return _context3.stop();
                 }
+              }
+            }, _callee3);
+          }));
 
-                return onOk;
-              }()
-            });
-          },
-          key: "del"
-        }, /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, null), " \u5220\u9664"));
-      } else if (item.type === 'extraAction') {
-        var _item$actionRender;
-
-        return (_item$actionRender = item.actionRender) === null || _item$actionRender === void 0 ? void 0 : _item$actionRender.call(item, record, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
-          return regeneratorRuntime.wrap(function _callee4$(_context4) {
-            while (1) {
-              switch (_context4.prev = _context4.next) {
-                case 0:
-                  if (!item.actionMethod) {
-                    _context4.next = 3;
-                    break;
-                  }
+          function onOk() {
+            return _onOk.apply(this, arguments);
+          }
+
+          return onOk;
+        }()
+      });
+    },
+    extraAction: function extraAction(item, record, index) {
+      var _item$actionRender;
 
+      return (_item$actionRender = item.actionRender) === null || _item$actionRender === void 0 ? void 0 : _item$actionRender.call(item, record, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+        return regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                if (!item.actionMethod) {
                   _context4.next = 3;
-                  return item.actionMethod(record, function () {
-                    var _actionRef$current3;
+                  break;
+                }
 
-                    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.reload();
-                  });
+                _context4.next = 3;
+                return item.actionMethod(record, function () {
+                  var _actionRef$current3;
 
-                case 3:
-                case "end":
-                  return _context4.stop();
-              }
+                  actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.reload();
+                });
+
+              case 3:
+              case "end":
+                return _context4.stop();
             }
-          }, _callee4);
-        })), index);
+          }
+        }, _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 = {
+    view: {
+      title: '查看',
+      key: 'view',
+      icon: /*#__PURE__*/React__default['default'].createElement(icons.EyeOutlined, null)
+    },
+    edit: {
+      title: '编辑',
+      key: 'edit',
+      icon: /*#__PURE__*/React__default['default'].createElement(icons.EditOutlined, null)
+    },
+    delete: {
+      title: '删除',
+      key: 'delete',
+      icon: /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, null)
+    }
+  };
+
+  var tableActionDom = function tableActionDom(record, index) {
+    return tableAction === null || tableAction === void 0 ? void 0 : tableAction.map(function (item) {
+      var _actionHandler$item$t2;
+
+      var btn = actionConfig[item.type];
+
+      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;
+
+            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);
     });
   };
 
@@ -10380,10 +10460,10 @@ var TabelCard = function TabelCard(props, ref) {
 
                           _context5.next = 3;
                           return item.actionMethod(values, function () {
-                            var _actionRef$current4;
+                            var _actionRef$current5;
 
                             loading();
-                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.reload();
                           });
 
                         case 3:
@@ -10408,9 +10488,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$current5;
+            var _actionRef$current6;
 
-            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.reload();
+            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload();
           });
         });
       }
@@ -10456,7 +10536,19 @@ var TabelCard = function TabelCard(props, ref) {
     onFormChange: onFormChange,
     extraColumns: extraColumns || [],
     columns: (columns || []).filter(function (item) {
-      return !item.hiddenInModalForm;
+      if (item.hiddenInModalForm) {
+        return false;
+      }
+
+      if (item.onlyShowInView) {
+        if (modalFormConfig.type === '查看') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+
+      return true;
     })
   })), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2({
     actionRef: actionRef,
@@ -10473,7 +10565,23 @@ var TabelCard = function TabelCard(props, ref) {
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }, optionColumnConfig)]) : columns || [],
+    }, optionColumnConfig)]).map(function (item) {
+      var obj = _objectSpread2({}, item);
+
+      if (item.notInitialValueInSearch) {
+        delete obj.initialValue;
+      }
+
+      return obj;
+    }) : (columns || []).map(function (item) {
+      var obj = _objectSpread2({}, item);
+
+      if (item.notInitialValueInSearch) {
+        delete obj.initialValue;
+      }
+
+      return obj;
+    }),
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {