qmwts 1.1.47 → 1.1.49

package/dist/utils/array-utils.d.ts

@@ -6,6 +6,6 @@ declare const _default: {
      * @param parentKey 关联上级字段
      * @param childrenKey 下级字段
      */
-    arrayToTree<T>(array?: any[], idKey?: string, parentKey?: string, childrenKey?: string): T[];
+    treeify<T>(array?: any[], idKey?: string, parentKey?: string, childrenKey?: string): T[];
 };
 export default _default;

package/dist/utils/array-utils.js

@@ -19,24 +19,26 @@ exports.default = {
      * @param parentKey 关联上级字段
      * @param childrenKey 下级字段
      */
-    arrayToTree: function (array, idKey, parentKey, childrenKey) {
+    treeify: function (array, idKey, parentKey, childrenKey) {
         if (array === void 0) { array = []; }
         if (idKey === void 0) { idKey = 'id'; }
         if (parentKey === void 0) { parentKey = 'parentId'; }
         if (childrenKey === void 0) { childrenKey = 'children'; }
         var map = new Map(); // 先根据每项的parentId将该项放入Map
+        var ids = []; // 记录所有的id，parentId不在这个集合内则说明是最上级
         for (var i = array.length - 1; i >= 0; i--) {
-            var _a = array, _b = i, e = _a[_b], _c = e, _d = parentKey, pid = _c[_d];
+            var _a = array, _b = i, e = _a[_b], _c = e, _d = idKey, id = _c[_d], _e = parentKey, pid = _c[_e];
             var children = map.get(pid) || [];
             children.unshift(__assign({}, e));
             map.set(pid, children);
+            ids.push(id);
         }
         var o = [];
         var values = Array.from(map.values()).flat();
         for (var i = values.length - 1; i >= 0; i--) {
-            var _e = values, _f = i, e = _e[_f], _g = e, _h = idKey, id = _g[_h], _j = parentKey, pid = _g[_j];
+            var _f = values, _g = i, e = _f[_g], _h = e, _j = idKey, id = _h[_j], _k = parentKey, pid = _h[_k];
             e[childrenKey] = map.get(id); // 赋值children
-            if (!pid) // 只返回最上级
+            if (!ids.includes(pid)) // 只返回最上级
                 o.unshift(e);
         }
         return o;

package/dist/utils/json-utils.d.ts

@@ -3,7 +3,7 @@ declare const _default: {
     isArray(o: any): boolean;
     parseObject<T>(o: any): T;
     parseArray<T>(o: any): T[];
-    optionalChaining(o: any, chain: string, substitute?: any): any;
+    optionalChaining(o: any | undefined, chain: string, substitute?: any): any;
     setNull(o?: any, exclusions?: any): void;
 };
 export default _default;

package/dist/utils/number-utils.js

@@ -10,10 +10,12 @@ exports.default = {
         for (var _i = 0; _i < arguments.length; _i++) {
             number[_i] = arguments[_i];
         }
-        return number.every(function (e) {
-            e = String(e).trim();
-            return e !== '' && isFinite(e) && !isNaN(e);
-        });
+        for (var i = number.length - 1; i >= 0; i--) {
+            var e = String(number[i]).trim();
+            if (e === '' || !isFinite(+e) || isNaN(+e))
+                return false;
+        }
+        return true;
     },
     // 增加千分位分隔符
     thousandths: function (number, fixed) {
@@ -29,8 +31,13 @@ exports.default = {
         return number;
     },
     summation: function (array) {
-        var _this = this;
         if (array === void 0) { array = []; }
-        return array.reduce(function (prev, curr) { return prev + _this.ifNaN(curr, 0); }, 0);
+        var sum = 0;
+        for (var i = array.length - 1; i >= 0; i--) {
+            var e = +array[i];
+            if (this.isNumber(e))
+                sum += e;
+        }
+        return sum;
     },
 };

package/dist/utils/request-data-generator.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    generate(data: any, params: FormData | URLSearchParams): FormData | URLSearchParams;
+    generate(data: any | undefined, params: FormData | URLSearchParams): FormData | URLSearchParams;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
   "devDependencies": {
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.8.2"
   },
   "files": [
     "dist"