@lemon-fe/kits 1.4.22 → 1.4.23

package/es/hooks/use-batch-operator/index.d.ts

@@ -8,6 +8,8 @@ declare type ProcessStepParams<T> = {
      * 上一步的额外信息，如果上一步执行成功，则没有该数据
      */
     payload?: any;
+    /** 这一步的操作是否允许自动执行 */
+    skipWarning?: boolean;
 };
 declare type ProcessStep<T, R> = {
     /** 在不传入render warning会自动进行二次确认  */
@@ -39,6 +41,14 @@ interface Props<RecordType extends Record<string, any> = Record<string, any>, Re
      */
     footer?: ReactNode | ((record: RecordType[], others: {
         results: Map<Key, Result<ResultType>>;
+        isExecuting?: boolean;
+        /**
+         * 全部执行逻辑
+         * 主要功能以handle里中的skipWarning实现
+         * 使用时，注意配置process中的skipWarning
+         * 中间不配置skipWarning的步骤会停下来
+         **/
+        executeUntilBlocked: () => void;
     }) => ReactNode);
     /**
      * @description 关闭时触发

package/es/hooks/use-batch-operator/index.js

@@ -91,6 +91,16 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
       var result = typeof rowKey === 'function' ? rowKey(record) : get(record, rowKey);
       return String(result !== null && result !== void 0 ? result : '').toString();
     });
+    _defineProperty(_assertThisInitialized(_this), "executeUntilBlocked", function () {
+      var results = _this.state.results;
+      var params = _this.props.params;
+      results.forEach(function (result, id) {
+        if (!result.loading && result.error && result.stepIdx !== undefined) {
+          var stepIdx = result.stepIdx;
+          _this.processNode(id, stepIdx + 1, params, undefined, true);
+        }
+      });
+    });
     _defineProperty(_assertThisInitialized(_this), "handleClose", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _this$props, onBeforeClose, onClose, data, results, value;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -214,40 +224,56 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
     value: function () {
       var _processNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(id, stepIdx, payload, next) {
         var _this2 = this;
-        var process, _this$locale, continueText, oprationSuccessText, grid, node, data, _process$stepIdx, handler, renderResult, mode, isFinal, done, _result;
+        var skipWarning,
+          process,
+          _this$locale,
+          continueText,
+          oprationSuccessText,
+          grid,
+          node,
+          data,
+          _process$stepIdx,
+          handler,
+          renderResult,
+          mode,
+          isFinal,
+          done,
+          _result,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              skipWarning = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : false;
               process = this.state.process;
               _this$locale = this.locale, continueText = _this$locale.continueText, oprationSuccessText = _this$locale.oprationSuccessText;
               if (!(stepIdx >= process.length)) {
-                _context2.next = 5;
+                _context2.next = 6;
                 break;
               }
               next === null || next === void 0 || next();
               return _context2.abrupt("return");
-            case 5:
+            case 6:
               grid = this.grid.current;
               if (!(!grid || !grid.ready())) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
               return _context2.abrupt("return");
-            case 8:
+            case 9:
               node = grid.api.getRowNode(id);
               if (node) {
-                _context2.next = 11;
+                _context2.next = 12;
                 break;
               }
               return _context2.abrupt("return");
-            case 11:
+            case 12:
               data = node.data;
               if (data) {
-                _context2.next = 14;
+                _context2.next = 15;
                 break;
               }
               return _context2.abrupt("return");
-            case 14:
+            case 15:
               _process$stepIdx = process[stepIdx], handler = _process$stepIdx.handler, renderResult = _process$stepIdx.render, mode = _process$stepIdx.mode;
               isFinal = stepIdx === process.length - 1;
               done = function done(result, error) {
@@ -258,6 +284,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                       result: result,
                       error: error,
                       payload: payload,
+                      stepIdx: stepIdx,
                       render: function render() {
                         if (error) {
                           if (mode === 'warning') {
@@ -322,6 +349,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                       result: result,
                       error: error,
                       payload: payload,
+                      stepIdx: stepIdx,
                       render: function render() {
                         return renderResult({
                           data: data,
@@ -343,40 +371,41 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                     });
                   }
                 } else {
-                  _this2.processNode(id, stepIdx + 1, undefined, next);
+                  _this2.processNode(id, stepIdx + 1, undefined, next, skipWarning);
                 }
               };
-              _context2.prev = 17;
+              _context2.prev = 18;
               this.changeResult(id, {
                 loading: true
               });
 
               /** 这里需要将handler处理成异步函数，否则后续next拿到的this.state.paused依旧是true */
-              _context2.next = 21;
+              _context2.next = 22;
               return new Promise(function (res) {
                 /** 不能使用requestAnimationFrame，因为这个函数会在页面后台被浏览器阻塞，使用setTimeout至少还能执行，虽然会降低执行速度，后续可以考虑优化state的使用 */
                 setTimeout(res);
               });
-            case 21:
-              _context2.next = 23;
+            case 22:
+              _context2.next = 24;
               return handler({
                 data: data,
-                payload: payload
+                payload: payload,
+                skipWarning: skipWarning
               });
-            case 23:
+            case 24:
               _result = _context2.sent;
               done(_result);
-              _context2.next = 30;
+              _context2.next = 31;
               break;
-            case 27:
-              _context2.prev = 27;
-              _context2.t0 = _context2["catch"](17);
+            case 28:
+              _context2.prev = 28;
+              _context2.t0 = _context2["catch"](18);
               done(undefined, _context2.t0);
-            case 30:
+            case 31:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[17, 27]]);
+        }, _callee2, this, [[18, 28]]);
       }));
       function processNode(_x, _x2, _x3, _x4) {
         return _processNode.apply(this, arguments);
@@ -655,7 +684,9 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
           });
         },
         footer: typeof footer === 'function' ? footer(data, {
-          results: this.getError()
+          results: this.getError(),
+          isExecuting: !paused,
+          executeUntilBlocked: this.executeUntilBlocked
         }) : footer,
         maskClosable: false,
         afterClose: function afterClose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.4.22",
+  "version": "1.4.23",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@lemon-fe/components": "^1.4.22",
+    "@lemon-fe/components": "^1.4.23",
     "@lemon-fe/hooks": "^1.4.15",
     "@lemon-fe/utils": "^1.4.15",
     "ag-grid-community": "29.2.0",
@@ -47,5 +47,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "028b91754f651ef860b0e57a2a8e538087334e17"
+  "gitHead": "c3d8070a21dfdb8b63295e76dd0b8484a94d372a"
 }