wargerm 0.2.2 → 0.2.3

package/dist/index.esm.js

@@ -9392,17 +9392,10 @@ var ModalForm = function ModalForm(props, ref) {
     }
   };
 
-  var done = function done() {
-    setVisible(false);
-  };
-
   useImperativeHandle(ref, function () {
     return {
       formRef: formRef,
-      onSubmit: onSubmit,
-      done: done // resetFields,
-      // setFieldsValue,
-
+      onSubmit: onSubmit
     };
   });
 
@@ -9442,20 +9435,20 @@ var ModalForm = function ModalForm(props, ref) {
               res = {};
 
               if (!submitMethod) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
 
               _context2.next = 5;
               return submitMethod(values, function () {
-                setConfirmLoading(false);
                 setVisible(false);
               });
 
             case 5:
               res = _context2.sent;
+              setConfirmLoading(false);
 
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -9520,11 +9513,6 @@ var TabelCard = function TabelCard(props, ref) {
       modalFormConfig = _useState4[0],
       setModalFormConfig = _useState4[1];
 
-  var _useState5 = useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      submitValues = _useState6[0],
-      setSubmitValues = _useState6[1];
-
   useImperativeHandle(ref, function () {
     return {};
   });
@@ -9547,7 +9535,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '编辑',
               record: record,
               modalOnOk: function () {
-                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values, loading) {
                   return regeneratorRuntime.wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
@@ -9561,6 +9549,7 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current;
 
+                            loading();
                             actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
                           });
 
@@ -9572,7 +9561,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee);
                 }));
 
-                function modalOnOk(_x) {
+                function modalOnOk(_x, _x2) {
                   return _modalOnOk.apply(this, arguments);
                 }
 
@@ -9708,7 +9697,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '新增',
               record: {},
               modalOnOk: function () {
-                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
+                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values, loading) {
                   return regeneratorRuntime.wrap(function _callee5$(_context5) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
@@ -9722,7 +9711,8 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current4;
 
-                            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
+                            loading();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
                           });
 
                         case 3:
@@ -9733,7 +9723,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee5);
                 }));
 
-                function modalOnOk(_x2) {
+                function modalOnOk(_x3, _x4) {
                   return _modalOnOk3.apply(this, arguments);
                 }
 
@@ -9754,7 +9744,7 @@ var TabelCard = function TabelCard(props, ref) {
         });
       }
     });
-  }, [submitValues, actionRef]);
+  }, [actionRef]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: formRef,
     title: modalFormConfig.type || '新增',
@@ -9769,17 +9759,14 @@ var TabelCard = function TabelCard(props, ref) {
             switch (_context6.prev = _context6.next) {
               case 0:
                 if (!modalFormConfig.modalOnOk) {
-                  _context6.next = 4;
+                  _context6.next = 3;
                   break;
                 }
 
                 _context6.next = 3;
-                return modalFormConfig.modalOnOk(values);
+                return modalFormConfig.modalOnOk(values, loading);
 
               case 3:
-                loading();
-
-              case 4:
               case "end":
                 return _context6.stop();
             }
@@ -9787,7 +9774,7 @@ var TabelCard = function TabelCard(props, ref) {
         }, _callee6);
       }));
 
-      function submitMethod(_x3, _x4) {
+      function submitMethod(_x5, _x6) {
         return _submitMethod.apply(this, arguments);
       }
 
@@ -9805,14 +9792,14 @@ var TabelCard = function TabelCard(props, ref) {
     options: false,
     toolBarRender: false,
     request: request,
-    columns: [].concat(_toConsumableArray(columns || []), [{
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [{
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }]),
+    }]) : columns || [],
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {

package/dist/index.js

@@ -9424,17 +9424,10 @@ var ModalForm = function ModalForm(props, ref) {
     }
   };
 
-  var done = function done() {
-    setVisible(false);
-  };
-
   React.useImperativeHandle(ref, function () {
     return {
       formRef: formRef,
-      onSubmit: onSubmit,
-      done: done // resetFields,
-      // setFieldsValue,
-
+      onSubmit: onSubmit
     };
   });
 
@@ -9474,20 +9467,20 @@ var ModalForm = function ModalForm(props, ref) {
               res = {};
 
               if (!submitMethod) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
 
               _context2.next = 5;
               return submitMethod(values, function () {
-                setConfirmLoading(false);
                 setVisible(false);
               });
 
             case 5:
               res = _context2.sent;
+              setConfirmLoading(false);
 
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -9552,11 +9545,6 @@ var TabelCard = function TabelCard(props, ref) {
       modalFormConfig = _useState4[0],
       setModalFormConfig = _useState4[1];
 
-  var _useState5 = React.useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      submitValues = _useState6[0],
-      setSubmitValues = _useState6[1];
-
   React.useImperativeHandle(ref, function () {
     return {};
   });
@@ -9579,7 +9567,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '编辑',
               record: record,
               modalOnOk: function () {
-                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+                var _modalOnOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values, loading) {
                   return regeneratorRuntime.wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
@@ -9593,6 +9581,7 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current;
 
+                            loading();
                             actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
                           });
 
@@ -9604,7 +9593,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee);
                 }));
 
-                function modalOnOk(_x) {
+                function modalOnOk(_x, _x2) {
                   return _modalOnOk.apply(this, arguments);
                 }
 
@@ -9740,7 +9729,7 @@ var TabelCard = function TabelCard(props, ref) {
               type: '新增',
               record: {},
               modalOnOk: function () {
-                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
+                var _modalOnOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values, loading) {
                   return regeneratorRuntime.wrap(function _callee5$(_context5) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
@@ -9754,7 +9743,8 @@ var TabelCard = function TabelCard(props, ref) {
                           return item.actionMethod(values, function () {
                             var _actionRef$current4;
 
-                            return actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
+                            loading();
+                            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.reload();
                           });
 
                         case 3:
@@ -9765,7 +9755,7 @@ var TabelCard = function TabelCard(props, ref) {
                   }, _callee5);
                 }));
 
-                function modalOnOk(_x2) {
+                function modalOnOk(_x3, _x4) {
                   return _modalOnOk3.apply(this, arguments);
                 }
 
@@ -9786,7 +9776,7 @@ var TabelCard = function TabelCard(props, ref) {
         });
       }
     });
-  }, [submitValues, actionRef]);
+  }, [actionRef]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: formRef,
     title: modalFormConfig.type || '新增',
@@ -9801,17 +9791,14 @@ var TabelCard = function TabelCard(props, ref) {
             switch (_context6.prev = _context6.next) {
               case 0:
                 if (!modalFormConfig.modalOnOk) {
-                  _context6.next = 4;
+                  _context6.next = 3;
                   break;
                 }
 
                 _context6.next = 3;
-                return modalFormConfig.modalOnOk(values);
+                return modalFormConfig.modalOnOk(values, loading);
 
               case 3:
-                loading();
-
-              case 4:
               case "end":
                 return _context6.stop();
             }
@@ -9819,7 +9806,7 @@ var TabelCard = function TabelCard(props, ref) {
         }, _callee6);
       }));
 
-      function submitMethod(_x3, _x4) {
+      function submitMethod(_x5, _x6) {
         return _submitMethod.apply(this, arguments);
       }
 
@@ -9837,14 +9824,14 @@ var TabelCard = function TabelCard(props, ref) {
     options: false,
     toolBarRender: false,
     request: request,
-    columns: [].concat(_toConsumableArray(columns || []), [{
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [{
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }]),
+    }]) : columns || [],
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {

package/package.json

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