tools-min-ns 1.12.2 → 1.14.0

package/README.md

@@ -5,6 +5,13 @@ cnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.14.0
+> ArrayUtil 新增三个分组方法
+## v1.13.0
+> RequestUtil
+- handleRequests 中onUploadProgress新增两个参数nowResponse: T; endResponses: T[]
+- 新增nsPromise 请求处理
+
 ## v1.12.2
 > DateUtil.formatDate参数为string类型错误
 ## v1.12.1

package/esm/array/ArrayUtil.d.ts

@@ -135,5 +135,43 @@ console.log(universalSort(objArray, obj => obj.name.length)); // [{ name: 'Jim',
 console.log(universalSort([5, 3, 8, 1, 2], null, 'desc')); // [8, 5, 3, 2, 1]
      */
     function universalSort<T>(array: T[], key?: keyof T | ((item: T) => any), order?: 'asc' | 'desc'): T[];
+    /**
+     * 根据对象的属性值进行分组
+     * @param array 对象数组
+     * @param key 对象的key
+     * @example
+const data = [
+  { name: 'Alice', age: 21 },
+  { name: 'Bob', age: 25 },
+  { name: 'Charlie', age: 21 },
+  { name: 'David', age: 25 }
+];
+
+const groupedByAge = groupBy(data, 'age');
+console.log(groupedByAge);  // {21: Array(2), 25: Array(2)}
+     */
+    function groupBy<T>(array: T[], key: keyof T): Record<keyof T, T[]>;
+    /**
+     * 按条件分组
+     * @param array 对象数组
+     * @param condition filter
+     * @example
+const numbers: number[] = [1, 2, 3, 4, 5, 6];
+
+const groupedByOddEven = groupByCondition(numbers, num => num % 2 === 0);
+console.log(groupedByOddEven); // {false: Array(3), true: Array(3)}
+     */
+    function groupByCondition<T>(array: T[], condition: (value: T) => boolean): Record<'true' | 'false', T[]>;
+    /**
+     * 按固定大小分组
+     * @param array 对象数组
+     * @param size 数量
+     * @example
+const data: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+
+const chunkedArray = chunkArray(data, 3);
+console.log(chunkedArray);// [Array(3), Array(3), Array(3)]
+     */
+    function chunkArray<T>(array: T[], size: number): T[][];
 }
 export default ArrayUtil;

package/esm/array/ArrayUtil.js

@@ -309,5 +309,67 @@ var ArrayUtil;
     return array.sort(compareFunction);
   }
   ArrayUtil.universalSort = universalSort;
+  /**
+   * 根据对象的属性值进行分组
+   * @param array 对象数组
+   * @param key 对象的key
+   * @example
+  const data = [
+  { name: 'Alice', age: 21 },
+  { name: 'Bob', age: 25 },
+  { name: 'Charlie', age: 21 },
+  { name: 'David', age: 25 }
+  ];
+  const groupedByAge = groupBy(data, 'age');
+  console.log(groupedByAge);  // {21: Array(2), 25: Array(2)}
+   */
+  function groupBy(array, key) {
+    return array.reduce(function (result, currentValue) {
+      var groupKey = currentValue[key];
+      if (!result[groupKey]) {
+        result[groupKey] = [];
+      }
+      result[groupKey].push(currentValue);
+      return result;
+    }, {});
+  }
+  ArrayUtil.groupBy = groupBy;
+  /**
+   * 按条件分组
+   * @param array 对象数组
+   * @param condition filter
+   * @example
+  const numbers: number[] = [1, 2, 3, 4, 5, 6];
+  const groupedByOddEven = groupByCondition(numbers, num => num % 2 === 0);
+  console.log(groupedByOddEven); // {false: Array(3), true: Array(3)}
+   */
+  function groupByCondition(array, condition) {
+    return array.reduce(function (result, currentValue) {
+      var groupKey = condition(currentValue) ? 'true' : 'false';
+      if (!result[groupKey]) {
+        result[groupKey] = [];
+      }
+      result[groupKey].push(currentValue);
+      return result;
+    }, {});
+  }
+  ArrayUtil.groupByCondition = groupByCondition;
+  /**
+   * 按固定大小分组
+   * @param array 对象数组
+   * @param size 数量
+   * @example
+  const data: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+  const chunkedArray = chunkArray(data, 3);
+  console.log(chunkedArray);// [Array(3), Array(3), Array(3)]
+   */
+  function chunkArray(array, size) {
+    var result = [];
+    for (var i = 0; i < array.length; i += size) {
+      result.push(array.slice(i, i + size));
+    }
+    return result;
+  }
+  ArrayUtil.chunkArray = chunkArray;
 })(ArrayUtil || (ArrayUtil = {}));
 export default ArrayUtil;

package/esm/request/RequestUtil.d.ts

@@ -7,6 +7,8 @@
 import mgop, { setDefaultHeader } from './mgop';
 import uniRquestFn from './uniRquest';
 import jsonpFn, { jsonpRquest as jsonpRquestFn } from './jsonp';
+import nsPromiseFn from './nsPromiseFn';
+export type PromiseInput<T> = Array<(() => Promise<T>) | Promise<T>> | (() => Promise<T>) | Promise<T>;
 declare namespace RequestUtil {
     /** @name 浙里办请求工具设置默认请求头 */
     const mgopSetDefaultHeader: typeof setDefaultHeader;
@@ -54,13 +56,79 @@ declare namespace RequestUtil {
      * @param options limit同时处理几个请求默认6个，onUploadProgress进度条
      * @returns
      */
-    function handleRequests<T = any>(requests: (() => Promise<any>)[], options?: {
+    function handleRequests<T = any>(requests: PromiseInput<T>, options?: {
         limit?: number;
         onUploadProgress?: (opt: {
             total: number;
             loaded: number;
             progress: number;
+            nowResponse: T;
+            endResponses: T[];
         }) => void;
     }): Promise<T[]>;
+    /**
+ * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+ * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+ * @param {Object} options - 配置选项
+ * @param {number} options.limit - 并发限制默认10
+ * @param {Function} options.stop - 停止函数的回调
+ * @returns {Promise<Array>} [err, result, isStop]
+ * @example
+ *
+// 示例方法：返回 Promise 的函数
+function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      const isSuccess = Math.random() > 0.5;
+      if (isSuccess) {
+        resolve('Success data');
+      } else {
+        reject(new Error('Something went wrong'));
+      }
+    }, 1000);
+  });
+}
+
+// 使用封装的 nsPromise 方法
+(async () => {
+  const [err, result, isStopped] = await nsPromise(
+    exampleAsyncFunction,
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 500); // 0.5秒后停止
+      }
+    }
+  );
+
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+    [
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+    ],
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 10000); // 10秒后停止
+      }
+    }
+  );
+
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+})();
+ */
+    const nsPromise: typeof nsPromiseFn;
 }
 export default RequestUtil;

package/esm/request/RequestUtil.js

@@ -122,6 +122,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
 import mgop, { setDefaultHeader } from './mgop';
 import uniRquestFn from './uniRquest';
 import jsonpFn, { jsonpRquest as jsonpRquestFn } from './jsonp';
+import nsPromiseFn from './nsPromiseFn';
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -180,8 +181,8 @@ var RequestUtil;
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                if (!(requests.length > 0)) return [3 /*break*/, 3];
-                res = requests.shift();
+                if (!functionArray.length) return [2 /*return*/];
+                res = functionArray.shift();
                 if (!res) return [2 /*return*/];
                 return [4 /*yield*/, res()];
               case 1:
@@ -199,21 +200,27 @@ var RequestUtil;
                 onUploadProgress === null || onUploadProgress === void 0 ? void 0 : onUploadProgress({
                   total: resLength,
                   loaded: loaded,
-                  progress: loaded / resLength
+                  progress: loaded / resLength,
+                  nowResponse: result,
+                  endResponses: results
                 });
-                _a.label = 3;
-              case 3:
                 return [2 /*return*/];
             }
           });
         });
       }
-      var _a, _b, limit, onUploadProgress, resLength, results, loaded, concurrent;
+      var _a, _b, limit, onUploadProgress, requestArray, functionArray, resLength, results, loaded, concurrent;
       return __generator(this, function (_c) {
         switch (_c.label) {
           case 0:
             _a = options !== null && options !== void 0 ? options : {}, _b = _a.limit, limit = _b === void 0 ? 6 : _b, onUploadProgress = _a.onUploadProgress;
-            resLength = requests.length;
+            requestArray = Array.isArray(requests) ? requests : [requests];
+            functionArray = requestArray.map(function (request) {
+              return typeof request === 'function' ? request : function () {
+                return Promise.resolve(request);
+              };
+            });
+            resLength = functionArray.length;
             results = [];
             loaded = 0;
             concurrent = Array.from({
@@ -233,5 +240,65 @@ var RequestUtil;
     });
   }
   RequestUtil.handleRequests = handleRequests;
+  /**
+  * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+  * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+  * @param {Object} options - 配置选项
+  * @param {number} options.limit - 并发限制默认10
+  * @param {Function} options.stop - 停止函数的回调
+  * @returns {Promise<Array>} [err, result, isStop]
+  * @example
+  *
+  // 示例方法：返回 Promise 的函数
+  function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+  setTimeout(() => {
+    const isSuccess = Math.random() > 0.5;
+    if (isSuccess) {
+      resolve('Success data');
+    } else {
+      reject(new Error('Something went wrong'));
+    }
+  }, 1000);
+  });
+  }
+  // 使用封装的 nsPromise 方法
+  (async () => {
+  const [err, result, isStopped] = await nsPromise(
+  exampleAsyncFunction,
+  {
+    limit: 10, // 控制并发数量
+    stop: (stopExecution) => {
+      setTimeout(stopExecution, 500); // 0.5秒后停止
+    }
+  }
+  );
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+  [
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+  ],
+  {
+    limit: 10, // 控制并发数量
+    stop: (stopExecution) => {
+      setTimeout(stopExecution, 10000); // 10秒后停止
+    }
+  }
+  );
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+  })();
+  */
+  RequestUtil.nsPromise = nsPromiseFn;
 })(RequestUtil || (RequestUtil = {}));
 export default RequestUtil;

package/esm/request/nsPromiseFn.d.ts

@@ -0,0 +1,74 @@
+import { PromiseInput } from './RequestUtil';
+interface Options {
+    /** @default 10 */
+    limit?: number;
+    stop?: (stopFn: () => void) => void;
+}
+type SingleResultTuple<T> = [Error | null, T | null, boolean];
+type MultipleResultTuple<T> = [(Error | null)[], (T | null)[], boolean];
+type Result<T, I> = I extends Array<any> ? MultipleResultTuple<T> : SingleResultTuple<T>;
+/**
+ * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+ * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+ * @param {Object} options - 配置选项
+ * @param {number} options.limit - 并发限制默认10
+ * @param {Function} options.stop - 停止函数的回调
+ * @returns {Promise<Array>} [err, result, isStop]
+ * @example
+ *
+// 示例方法：返回 Promise 的函数
+function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      const isSuccess = Math.random() > 0.5;
+      if (isSuccess) {
+        resolve('Success data');
+      } else {
+        reject(new Error('Something went wrong'));
+      }
+    }, 1000);
+  });
+}
+
+// 使用封装的 nsPromise 方法
+(async () => {
+  const [err, result, isStopped] = await nsPromise(
+    exampleAsyncFunction,
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 500); // 0.5秒后停止
+      }
+    }
+  );
+
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+    [
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+    ],
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 10000); // 10秒后停止
+      }
+    }
+  );
+
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+})();
+ */
+declare function nsPromiseFn<T = any, I = PromiseInput<T>>(input: I, options?: Options): Promise<Result<T, I>>;
+export default nsPromiseFn;

package/esm/request/nsPromiseFn.js

@@ -0,0 +1,128 @@
+/**
+ * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+ * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+ * @param {Object} options - 配置选项
+ * @param {number} options.limit - 并发限制默认10
+ * @param {Function} options.stop - 停止函数的回调
+ * @returns {Promise<Array>} [err, result, isStop]
+ * @example
+ *
+// 示例方法：返回 Promise 的函数
+function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      const isSuccess = Math.random() > 0.5;
+      if (isSuccess) {
+        resolve('Success data');
+      } else {
+        reject(new Error('Something went wrong'));
+      }
+    }, 1000);
+  });
+}
+
+// 使用封装的 nsPromise 方法
+(async () => {
+  const [err, result, isStopped] = await nsPromise(
+    exampleAsyncFunction,
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 500); // 0.5秒后停止
+      }
+    }
+  );
+
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+    [
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+    ],
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 10000); // 10秒后停止
+      }
+    }
+  );
+
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+})();
+ */
+function nsPromiseFn(input, options) {
+  if (options === void 0) {
+    options = {};
+  }
+  var _a = options.limit,
+    limit = _a === void 0 ? 10 : _a,
+    stop = options.stop;
+  var isStopped = false;
+  var activePromises = 0;
+  var currentIndex = 0;
+  var results = [];
+  var errors = [];
+  var isArrayInput = Array.isArray(input);
+  var promiseFunctions = isArrayInput ? input : [input];
+  var stopPromise = new Promise(function (_, reject) {
+    stop === null || stop === void 0 ? void 0 : stop(function () {
+      isStopped = true;
+      reject(new Error('Stopped'));
+    });
+  });
+  return new Promise(function (resolve) {
+    var executeNext = function executeNext() {
+      var _a, _b;
+      if (currentIndex >= promiseFunctions.length && activePromises === 0) {
+        if (isArrayInput) {
+          resolve([errors, results, isStopped]);
+        } else {
+          resolve([(_a = errors[0]) !== null && _a !== void 0 ? _a : null, (_b = results[0]) !== null && _b !== void 0 ? _b : null, isStopped]);
+        }
+        return;
+      }
+      while (activePromises < limit && currentIndex < promiseFunctions.length) {
+        var current = promiseFunctions[currentIndex];
+        currentIndex += 1;
+        activePromises += 1;
+        var promise = typeof current === 'function' ? current() : current;
+        Promise.race([promise, stopPromise]).then(function (data) {
+          if (!isStopped) {
+            results.push(data);
+            errors.push(null);
+          }
+        }).catch(function (err) {
+          if (!isStopped || err.message === 'Stopped') {
+            results.push(null);
+            errors.push(err);
+          }
+        }).finally(function () {
+          var _a, _b;
+          activePromises -= 1;
+          if (!isStopped) {
+            executeNext();
+          } else if (activePromises === 0) {
+            if (isArrayInput) {
+              resolve([errors, results, isStopped]);
+            } else {
+              resolve([(_a = errors[0]) !== null && _a !== void 0 ? _a : null, (_b = results[0]) !== null && _b !== void 0 ? _b : null, isStopped]);
+            }
+          }
+        });
+      }
+    };
+    executeNext();
+  });
+}
+export default nsPromiseFn;

package/lib/array/ArrayUtil.d.ts

@@ -135,5 +135,43 @@ console.log(universalSort(objArray, obj => obj.name.length)); // [{ name: 'Jim',
 console.log(universalSort([5, 3, 8, 1, 2], null, 'desc')); // [8, 5, 3, 2, 1]
      */
     function universalSort<T>(array: T[], key?: keyof T | ((item: T) => any), order?: 'asc' | 'desc'): T[];
+    /**
+     * 根据对象的属性值进行分组
+     * @param array 对象数组
+     * @param key 对象的key
+     * @example
+const data = [
+  { name: 'Alice', age: 21 },
+  { name: 'Bob', age: 25 },
+  { name: 'Charlie', age: 21 },
+  { name: 'David', age: 25 }
+];
+
+const groupedByAge = groupBy(data, 'age');
+console.log(groupedByAge);  // {21: Array(2), 25: Array(2)}
+     */
+    function groupBy<T>(array: T[], key: keyof T): Record<keyof T, T[]>;
+    /**
+     * 按条件分组
+     * @param array 对象数组
+     * @param condition filter
+     * @example
+const numbers: number[] = [1, 2, 3, 4, 5, 6];
+
+const groupedByOddEven = groupByCondition(numbers, num => num % 2 === 0);
+console.log(groupedByOddEven); // {false: Array(3), true: Array(3)}
+     */
+    function groupByCondition<T>(array: T[], condition: (value: T) => boolean): Record<'true' | 'false', T[]>;
+    /**
+     * 按固定大小分组
+     * @param array 对象数组
+     * @param size 数量
+     * @example
+const data: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+
+const chunkedArray = chunkArray(data, 3);
+console.log(chunkedArray);// [Array(3), Array(3), Array(3)]
+     */
+    function chunkArray<T>(array: T[], size: number): T[][];
 }
 export default ArrayUtil;

package/lib/array/ArrayUtil.js

@@ -319,5 +319,67 @@ var ArrayUtil;
     return array.sort(compareFunction);
   }
   ArrayUtil.universalSort = universalSort;
+  /**
+   * 根据对象的属性值进行分组
+   * @param array 对象数组
+   * @param key 对象的key
+   * @example
+  const data = [
+  { name: 'Alice', age: 21 },
+  { name: 'Bob', age: 25 },
+  { name: 'Charlie', age: 21 },
+  { name: 'David', age: 25 }
+  ];
+  const groupedByAge = groupBy(data, 'age');
+  console.log(groupedByAge);  // {21: Array(2), 25: Array(2)}
+   */
+  function groupBy(array, key) {
+    return array.reduce(function (result, currentValue) {
+      var groupKey = currentValue[key];
+      if (!result[groupKey]) {
+        result[groupKey] = [];
+      }
+      result[groupKey].push(currentValue);
+      return result;
+    }, {});
+  }
+  ArrayUtil.groupBy = groupBy;
+  /**
+   * 按条件分组
+   * @param array 对象数组
+   * @param condition filter
+   * @example
+  const numbers: number[] = [1, 2, 3, 4, 5, 6];
+  const groupedByOddEven = groupByCondition(numbers, num => num % 2 === 0);
+  console.log(groupedByOddEven); // {false: Array(3), true: Array(3)}
+   */
+  function groupByCondition(array, condition) {
+    return array.reduce(function (result, currentValue) {
+      var groupKey = condition(currentValue) ? 'true' : 'false';
+      if (!result[groupKey]) {
+        result[groupKey] = [];
+      }
+      result[groupKey].push(currentValue);
+      return result;
+    }, {});
+  }
+  ArrayUtil.groupByCondition = groupByCondition;
+  /**
+   * 按固定大小分组
+   * @param array 对象数组
+   * @param size 数量
+   * @example
+  const data: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+  const chunkedArray = chunkArray(data, 3);
+  console.log(chunkedArray);// [Array(3), Array(3), Array(3)]
+   */
+  function chunkArray(array, size) {
+    var result = [];
+    for (var i = 0; i < array.length; i += size) {
+      result.push(array.slice(i, i + size));
+    }
+    return result;
+  }
+  ArrayUtil.chunkArray = chunkArray;
 })(ArrayUtil || (ArrayUtil = {}));
 exports.default = ArrayUtil;

package/lib/request/RequestUtil.d.ts

@@ -7,6 +7,8 @@
 import mgop, { setDefaultHeader } from './mgop';
 import uniRquestFn from './uniRquest';
 import jsonpFn, { jsonpRquest as jsonpRquestFn } from './jsonp';
+import nsPromiseFn from './nsPromiseFn';
+export type PromiseInput<T> = Array<(() => Promise<T>) | Promise<T>> | (() => Promise<T>) | Promise<T>;
 declare namespace RequestUtil {
     /** @name 浙里办请求工具设置默认请求头 */
     const mgopSetDefaultHeader: typeof setDefaultHeader;
@@ -54,13 +56,79 @@ declare namespace RequestUtil {
      * @param options limit同时处理几个请求默认6个，onUploadProgress进度条
      * @returns
      */
-    function handleRequests<T = any>(requests: (() => Promise<any>)[], options?: {
+    function handleRequests<T = any>(requests: PromiseInput<T>, options?: {
         limit?: number;
         onUploadProgress?: (opt: {
             total: number;
             loaded: number;
             progress: number;
+            nowResponse: T;
+            endResponses: T[];
         }) => void;
     }): Promise<T[]>;
+    /**
+ * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+ * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+ * @param {Object} options - 配置选项
+ * @param {number} options.limit - 并发限制默认10
+ * @param {Function} options.stop - 停止函数的回调
+ * @returns {Promise<Array>} [err, result, isStop]
+ * @example
+ *
+// 示例方法：返回 Promise 的函数
+function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      const isSuccess = Math.random() > 0.5;
+      if (isSuccess) {
+        resolve('Success data');
+      } else {
+        reject(new Error('Something went wrong'));
+      }
+    }, 1000);
+  });
+}
+
+// 使用封装的 nsPromise 方法
+(async () => {
+  const [err, result, isStopped] = await nsPromise(
+    exampleAsyncFunction,
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 500); // 0.5秒后停止
+      }
+    }
+  );
+
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+    [
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+    ],
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 10000); // 10秒后停止
+      }
+    }
+  );
+
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+})();
+ */
+    const nsPromise: typeof nsPromiseFn;
 }
 export default RequestUtil;

package/lib/request/RequestUtil.js

@@ -163,6 +163,7 @@ Object.defineProperty(exports, "__esModule", {
 var mgop_1 = __importStar(require("./mgop"));
 var uniRquest_1 = __importDefault(require("./uniRquest"));
 var jsonp_1 = __importStar(require("./jsonp"));
+var nsPromiseFn_1 = __importDefault(require("./nsPromiseFn"));
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -221,8 +222,8 @@ var RequestUtil;
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                if (!(requests.length > 0)) return [3 /*break*/, 3];
-                res = requests.shift();
+                if (!functionArray.length) return [2 /*return*/];
+                res = functionArray.shift();
                 if (!res) return [2 /*return*/];
                 return [4 /*yield*/, res()];
               case 1:
@@ -240,21 +241,27 @@ var RequestUtil;
                 onUploadProgress === null || onUploadProgress === void 0 ? void 0 : onUploadProgress({
                   total: resLength,
                   loaded: loaded,
-                  progress: loaded / resLength
+                  progress: loaded / resLength,
+                  nowResponse: result,
+                  endResponses: results
                 });
-                _a.label = 3;
-              case 3:
                 return [2 /*return*/];
             }
           });
         });
       }
-      var _a, _b, limit, onUploadProgress, resLength, results, loaded, concurrent;
+      var _a, _b, limit, onUploadProgress, requestArray, functionArray, resLength, results, loaded, concurrent;
       return __generator(this, function (_c) {
         switch (_c.label) {
           case 0:
             _a = options !== null && options !== void 0 ? options : {}, _b = _a.limit, limit = _b === void 0 ? 6 : _b, onUploadProgress = _a.onUploadProgress;
-            resLength = requests.length;
+            requestArray = Array.isArray(requests) ? requests : [requests];
+            functionArray = requestArray.map(function (request) {
+              return typeof request === 'function' ? request : function () {
+                return Promise.resolve(request);
+              };
+            });
+            resLength = functionArray.length;
             results = [];
             loaded = 0;
             concurrent = Array.from({
@@ -274,5 +281,65 @@ var RequestUtil;
     });
   }
   RequestUtil.handleRequests = handleRequests;
+  /**
+  * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+  * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+  * @param {Object} options - 配置选项
+  * @param {number} options.limit - 并发限制默认10
+  * @param {Function} options.stop - 停止函数的回调
+  * @returns {Promise<Array>} [err, result, isStop]
+  * @example
+  *
+  // 示例方法：返回 Promise 的函数
+  function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+  setTimeout(() => {
+    const isSuccess = Math.random() > 0.5;
+    if (isSuccess) {
+      resolve('Success data');
+    } else {
+      reject(new Error('Something went wrong'));
+    }
+  }, 1000);
+  });
+  }
+  // 使用封装的 nsPromise 方法
+  (async () => {
+  const [err, result, isStopped] = await nsPromise(
+  exampleAsyncFunction,
+  {
+    limit: 10, // 控制并发数量
+    stop: (stopExecution) => {
+      setTimeout(stopExecution, 500); // 0.5秒后停止
+    }
+  }
+  );
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+  [
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+    exampleAsyncFunction,
+  ],
+  {
+    limit: 10, // 控制并发数量
+    stop: (stopExecution) => {
+      setTimeout(stopExecution, 10000); // 10秒后停止
+    }
+  }
+  );
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+  })();
+  */
+  RequestUtil.nsPromise = nsPromiseFn_1.default;
 })(RequestUtil || (RequestUtil = {}));
 exports.default = RequestUtil;

package/lib/request/nsPromiseFn.d.ts

@@ -0,0 +1,74 @@
+import { PromiseInput } from './RequestUtil';
+interface Options {
+    /** @default 10 */
+    limit?: number;
+    stop?: (stopFn: () => void) => void;
+}
+type SingleResultTuple<T> = [Error | null, T | null, boolean];
+type MultipleResultTuple<T> = [(Error | null)[], (T | null)[], boolean];
+type Result<T, I> = I extends Array<any> ? MultipleResultTuple<T> : SingleResultTuple<T>;
+/**
+ * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+ * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+ * @param {Object} options - 配置选项
+ * @param {number} options.limit - 并发限制默认10
+ * @param {Function} options.stop - 停止函数的回调
+ * @returns {Promise<Array>} [err, result, isStop]
+ * @example
+ *
+// 示例方法：返回 Promise 的函数
+function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      const isSuccess = Math.random() > 0.5;
+      if (isSuccess) {
+        resolve('Success data');
+      } else {
+        reject(new Error('Something went wrong'));
+      }
+    }, 1000);
+  });
+}
+
+// 使用封装的 nsPromise 方法
+(async () => {
+  const [err, result, isStopped] = await nsPromise(
+    exampleAsyncFunction,
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 500); // 0.5秒后停止
+      }
+    }
+  );
+
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+    [
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+    ],
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 10000); // 10秒后停止
+      }
+    }
+  );
+
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+})();
+ */
+declare function nsPromiseFn<T = any, I = PromiseInput<T>>(input: I, options?: Options): Promise<Result<T, I>>;
+export default nsPromiseFn;

package/lib/request/nsPromiseFn.js

@@ -0,0 +1,133 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+/**
+ * 封装多个 Promise 方法，返回 [错误, 数据, 停止状态] 格式
+ * @param {Array<Function | Promise> | Function | Promise} input - 返回 Promise 的函数数组或 Promise 数组，或者单个函数或 Promise
+ * @param {Object} options - 配置选项
+ * @param {number} options.limit - 并发限制默认10
+ * @param {Function} options.stop - 停止函数的回调
+ * @returns {Promise<Array>} [err, result, isStop]
+ * @example
+ *
+// 示例方法：返回 Promise 的函数
+function exampleAsyncFunction() {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      const isSuccess = Math.random() > 0.5;
+      if (isSuccess) {
+        resolve('Success data');
+      } else {
+        reject(new Error('Something went wrong'));
+      }
+    }, 1000);
+  });
+}
+
+// 使用封装的 nsPromise 方法
+(async () => {
+  const [err, result, isStopped] = await nsPromise(
+    exampleAsyncFunction,
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 500); // 0.5秒后停止
+      }
+    }
+  );
+
+  console.log('Error:', err);//Error: null
+  console.log('Result:', result);//Result: null
+  console.log('Is Stopped:', isStopped);//Is Stopped: true
+
+  const [arrayErr, arrayResults, arrayIsStopped] = await nsPromise(
+    [
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+      exampleAsyncFunction,
+    ],
+    {
+      limit: 10, // 控制并发数量
+      stop: (stopExecution) => {
+        setTimeout(stopExecution, 10000); // 10秒后停止
+      }
+    }
+  );
+
+  console.log('Array Errors:', arrayErr);//Array Errors: (8) [null, Error: Direct promise failure at <anonymous>:117:58, null, Error: Something went wrong at <anonymous>:86:16, Error: Something went wrong at <anonymous>:86:16, null, null, null]
+  console.log('Array Results:', arrayResults); //Array Results: (8) ["Direct promise success", null, "Success data", null, null, "Success data", "Success data", "Success data"]
+  console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
+})();
+ */
+function nsPromiseFn(input, options) {
+  if (options === void 0) {
+    options = {};
+  }
+  var _a = options.limit,
+    limit = _a === void 0 ? 10 : _a,
+    stop = options.stop;
+  var isStopped = false;
+  var activePromises = 0;
+  var currentIndex = 0;
+  var results = [];
+  var errors = [];
+  var isArrayInput = Array.isArray(input);
+  var promiseFunctions = isArrayInput ? input : [input];
+  var stopPromise = new Promise(function (_, reject) {
+    stop === null || stop === void 0 ? void 0 : stop(function () {
+      isStopped = true;
+      reject(new Error('Stopped'));
+    });
+  });
+  return new Promise(function (resolve) {
+    var executeNext = function executeNext() {
+      var _a, _b;
+      if (currentIndex >= promiseFunctions.length && activePromises === 0) {
+        if (isArrayInput) {
+          resolve([errors, results, isStopped]);
+        } else {
+          resolve([(_a = errors[0]) !== null && _a !== void 0 ? _a : null, (_b = results[0]) !== null && _b !== void 0 ? _b : null, isStopped]);
+        }
+        return;
+      }
+      while (activePromises < limit && currentIndex < promiseFunctions.length) {
+        var current = promiseFunctions[currentIndex];
+        currentIndex += 1;
+        activePromises += 1;
+        var promise = typeof current === 'function' ? current() : current;
+        Promise.race([promise, stopPromise]).then(function (data) {
+          if (!isStopped) {
+            results.push(data);
+            errors.push(null);
+          }
+        }).catch(function (err) {
+          if (!isStopped || err.message === 'Stopped') {
+            results.push(null);
+            errors.push(err);
+          }
+        }).finally(function () {
+          var _a, _b;
+          activePromises -= 1;
+          if (!isStopped) {
+            executeNext();
+          } else if (activePromises === 0) {
+            if (isArrayInput) {
+              resolve([errors, results, isStopped]);
+            } else {
+              resolve([(_a = errors[0]) !== null && _a !== void 0 ? _a : null, (_b = results[0]) !== null && _b !== void 0 ? _b : null, isStopped]);
+            }
+          }
+        });
+      }
+    };
+    executeNext();
+  });
+}
+exports.default = nsPromiseFn;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.12.2",
+  "version": "1.14.0",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",