@lemon-fe/kits 1.4.22-alpha.4 → 1.4.22-alpha.5

package/es/app-provider/index.d.ts

@@ -2,13 +2,16 @@ import React, { type ReactNode } from 'react';
 import type { Locale } from '../locale/locale';
 import { message, Modal } from '@lemon-fe/components';
 import { type HooksOpts } from '@lemon-fe/hooks';
+/** 为了性能考虑所有配置都只使用初始值，防止上下文频繁更新导致渲染问题 */
 declare type AppConfigProps = {
     children?: ReactNode | null;
     locale?: Locale;
     hooksConfig?: Partial<HooksOpts>;
+    batchOperatorConfig?: BatchOperatorConfig;
 };
 declare type BatchOperatorConfig = {
     openError?: (err: Error) => void;
+    concurrency?: number;
 };
 export declare const AppContext: React.Context<{
     message: ReturnType<typeof message.useMessage>[0];
@@ -17,6 +20,10 @@ export declare const AppContext: React.Context<{
 }>;
 declare function AppProvider(props: AppConfigProps): JSX.Element;
 declare namespace AppProvider {
-    var useApp;
+    var useApp: () => {
+        message: import("antd/lib/message").MessageInstance;
+        modal: Omit<import("antd/lib/modal/confirm").ModalStaticFunctions, "warn">;
+        batchOperatorConfig?: BatchOperatorConfig | undefined;
+    };
 }
 export default AppProvider;

package/es/app-provider/index.js

@@ -14,6 +14,8 @@ import React, { createContext, useMemo, useContext, useCallback } from 'react';
 import { PageLoading, message, Modal, ConfigProvider, Result, Button, RequestErrorMessage } from '@lemon-fe/components';
 import { HooksConfigProvider, useLatestRef } from '@lemon-fe/hooks';
 import { isRequestError } from '@lemon-fe/utils';
+
+/** 为了性能考虑所有配置都只使用初始值，防止上下文频繁更新导致渲染问题 */
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var AppContext = /*#__PURE__*/createContext({
@@ -60,9 +62,9 @@ export default function AppProvider(props) {
     }
   }, []);
   var batchOperatorConfig = useMemo(function () {
-    var result = {
+    var result = _objectSpread({
       openError: _showError
-    };
+    }, props.batchOperatorConfig);
     return result;
   }, []);
   var appContext = useMemo(function () {
@@ -75,7 +77,7 @@ export default function AppProvider(props) {
       },
       batchOperatorConfig: batchOperatorConfig
     };
-  }, [batchOperatorConfig]);
+  }, []);
   var hooksConfig = useMemo(function () {
     var result = _objectSpread({
       showToast: function showToast() {

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

@@ -89,6 +89,11 @@ interface Props<RecordType extends Record<string, any> = Record<string, any>, Re
      * @description 显示完整信息，可点击
      */
     openError?: (err: Error) => void;
+    /**
+     * @default 1
+     * @description 并发数
+     */
+    concurrency?: number;
 }
 export default function useBatchOperate<RecordType extends Record<string, any> = Record<string, any>, ResultType = any, ParamsType = any>(options: Props<RecordType, ResultType, ParamsType>): {
     run: (rows: RecordType[], otherOpts?: Partial<Props<RecordType, ResultType, ParamsType>>) => void;

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

@@ -36,6 +36,7 @@ import { ConfigProvider, Modal, Row, Spin, Typography } from '@lemon-fe/componen
 import { Actions, ComponentConfigureContext, DataGrid, Icons, Layout, Section } from '@lemon-fe/components';
 import { Subject } from '@lemon-fe/utils';
 import { get } from 'lodash';
+import PQueue from 'p-queue';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Text = Typography.Text;
@@ -51,6 +52,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "resultsSubject", new Subject());
     _defineProperty(_assertThisInitialized(_this), "mounted", true);
     _defineProperty(_assertThisInitialized(_this), "locale", defaultLocale);
+    _defineProperty(_assertThisInitialized(_this), "queue", void 0);
     _defineProperty(_assertThisInitialized(_this), "renderIconTip", function (type, err) {
       if (!(err instanceof Error)) {
         return /*#__PURE__*/_jsx(Icons.Tip, {
@@ -141,23 +143,6 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
         }
       }, _callee);
     })));
-    _defineProperty(_assertThisInitialized(_this), "handleStart", function () {
-      var _this$state = _this.state,
-        active = _this$state.active,
-        data = _this$state.data,
-        paused = _this$state.paused;
-      if (!paused) {
-        return;
-      }
-      if (active) {
-        var idx = data.findIndex(function (item) {
-          return _this.getRowKey(item) === active;
-        });
-        _this.run(idx + 1);
-      } else {
-        _this.run(0);
-      }
-    });
     if ((_props$locale = props.locale) !== null && _props$locale !== void 0 && _props$locale.UseBatchOperator) {
       _this.locale = props.locale.UseBatchOperator;
     }
@@ -170,22 +155,41 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
       process: _this.getProcess()
     };
     _this.resultsSubject.next(_this.state.results);
+    _this.queue = new PQueue({
+      concurrency: props.concurrency || 1,
+      autoStart: false
+    });
+    _this.queue.on('idle', function () {
+      // finish
+      _this.setState({
+        paused: true
+      });
+    });
     return _this;
   }
   _createClass(BatchOperate, [{
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.mounted = false;
+      this.queue.pause();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps, prevState) {
+      if (this.state.results !== prevState.results) {
+        this.resultsSubject.next(this.state.results);
+      }
     }
   }, {
     key: "changeResult",
     value: function changeResult(key, val) {
-      var newResults = new Map(this.state.results);
-      newResults.set(key, val);
-      this.setState({
-        results: newResults
+      this.setState(function (prev) {
+        var newResults = new Map(prev.results);
+        newResults.set(key, val);
+        return {
+          results: newResults
+        };
       });
-      this.resultsSubject.next(newResults);
     }
   }, {
     key: "deleteResult",
@@ -381,33 +385,18 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
     }()
   }, {
     key: "run",
-    value: function run(idx) {
+    value: function run(record) {
       var _this3 = this;
-      var data = this.state.data;
-      if (idx >= data.length) {
-        this.setState({
-          paused: true,
-          active: undefined
-        });
-        return;
-      }
-      this.setState({
-        paused: false
-      });
       var params = this.props.params;
-      var record = data[idx];
       var id = this.getRowKey(record);
-      this.setState({
-        active: id
-      });
       var grid = this.grid.current;
       if (grid && grid.ready()) {
         grid.api.ensureNodeVisible(record);
       }
-      this.processNode(id, 0, params, function () {
-        if (_this3.mounted && !_this3.state.paused) {
-          _this3.run(idx + 1);
-        }
+      return new Promise(function (res) {
+        _this3.processNode(id, 0, params, function () {
+          res();
+        });
       });
     }
   }, {
@@ -632,21 +621,19 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this6 = this,
-        _results$get;
+      var _this6 = this;
       var _this$props4 = this.props,
         modalTitle = _this$props4.modalTitle,
         _afterClose = _this$props4.afterClose,
         rowKey = _this$props4.rowKey,
         _this$props4$footer = _this$props4.footer,
         footer = _this$props4$footer === void 0 ? null : _this$props4$footer;
-      var _this$state2 = this.state,
-        results = _this$state2.results,
-        open = _this$state2.open,
-        data = _this$state2.data,
-        active = _this$state2.active,
-        cols = _this$state2.cols,
-        paused = _this$state2.paused;
+      var _this$state = this.state,
+        results = _this$state.results,
+        open = _this$state.open,
+        data = _this$state.data,
+        cols = _this$state.cols,
+        paused = _this$state.paused;
       var _this$locale3 = this.locale,
         detailsText = _this$locale3.detailsText,
         continueText = _this$locale3.continueText,
@@ -675,9 +662,9 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
           _this6.setState({
             results: new Map(),
             paused: true,
-            active: undefined,
             data: []
           });
+          _this6.queue.pause();
           _afterClose();
         },
         keyboard: false,
@@ -689,13 +676,26 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
               children: "".concat(detailsText).concat(results.size > 0 ? "(".concat(results.size, "/").concat(data.length, ")") : '')
             }), /*#__PURE__*/_jsx(Actions, {
               actions: [paused ? {
-                disabled: data.length <= 0 || results.size >= data.length || active !== undefined && ((_results$get = results.get(active)) === null || _results$get === void 0 ? void 0 : _results$get.loading),
-                text: active ? continueText : startExecText,
-                onClick: this.handleStart
+                disabled: data.length <= 0 || results.size >= data.length,
+                text: this.queue.size > 0 ? continueText : startExecText,
+                onClick: function onClick() {
+                  if (_this6.queue.size === 0) {
+                    _this6.queue.addAll(_this6.state.data.map(function (row) {
+                      return function () {
+                        return _this6.run(row);
+                      };
+                    }));
+                  }
+                  _this6.queue.start();
+                  _this6.setState({
+                    paused: false
+                  });
+                }
               } : {
                 disabled: data.length <= 0,
                 text: suspendExecText,
                 onClick: function onClick() {
+                  _this6.queue.pause();
                   _this6.setState({
                     paused: true
                   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.4.22-alpha.4",
+  "version": "1.4.22-alpha.5",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@lemon-fe/components": "^1.4.22-alpha.4",
+    "@lemon-fe/components": "^1.4.22-alpha.5",
     "@lemon-fe/hooks": "^1.4.15",
     "@lemon-fe/utils": "^1.4.15",
     "ag-grid-community": "29.2.0",
@@ -32,6 +32,7 @@
     "classnames": "^2.2.6",
     "lodash": "^4.17.0",
     "moment": "^2.29.4",
+    "p-queue": "^6.6.2",
     "react-error-boundary": "^4.0.11"
   },
   "peerDependencies": {
@@ -46,5 +47,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "ff08fa04ab97d9f6ab0e9c9130e96be8e66c1bc6"
+  "gitHead": "0c4dc48dacd31fd903bbcbad684f4da20b51b543"
 }