qmwts 1.1.78 → 1.1.80

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

@@ -30,7 +30,7 @@ declare const _default: {
      * @param override 遇到重复元素是否覆盖
      */
     uniqueByKey<T, K = unknown>(array: T[] | undefined, value: (item: T) => K, override?: boolean): T[];
-    sort<T>(array: T[], order: "asc" | "desc", ...values: ((item: T) => number)[]): void;
+    sort<T>(array: T[], order: "asc" | "desc", ...values: ((item: T) => any)[]): void;
     mergeByKey<T extends object>(keyExtractor: (item: T) => string | number | symbol, ...arrays: T[][]): T[];
 };
 export default _default;

package/dist/utils/array-utils.js

@@ -10,6 +10,7 @@ exports.default = {
      * @param childrenKey 下级字段
      */
     treeify(array = [], idKey = 'id', parentKey = 'parentId', childrenKey = 'children') {
+        var _a;
         const map = new Map(); // 先根据每项的parentId将该项放入Map
         const ids = []; // 记录所有的id，parentId不在这个集合内则说明是最上级
         const length = array.length;
@@ -18,7 +19,7 @@ exports.default = {
             if (e == null)
                 continue;
             const id = e[idKey], pid = e[parentKey];
-            const children = map.get(pid) ?? [];
+            const children = (_a = map.get(pid)) !== null && _a !== void 0 ? _a : [];
             children.push(e);
             map.set(pid, children);
             ids.push(id);
@@ -91,7 +92,7 @@ exports.default = {
      * @param override 遇到重复元素是否覆盖
      */
     uniqueByKey(array = [], value, override = false) {
-        array = array ?? [];
+        array = array !== null && array !== void 0 ? array : [];
         const map = new Map();
         for (let i = 0; i < array.length; i++) {
             const e = array[i];
@@ -111,30 +112,41 @@ exports.default = {
             for (const fn of values) {
                 const valueA = fn(a);
                 const valueB = fn(b);
+                if (typeof valueA === 'string' && typeof valueB === 'string')
+                    return valueA.localeCompare(valueB) * multiplier;
                 if (valueA - valueB !== 0)
                     return (valueA - valueB) * multiplier;
             }
             return 0;
         });
     },
-    mergeByKey(keyExtractor, ...arrays) {
+    mergeByKey(keyExtractor, // 限定key类型，避免非可哈希值
+    ...arrays) {
         // 1. 空值防御：过滤空数组，避免无效遍历
         const validArrays = arrays.filter(arr => Array.isArray(arr) && arr.length > 0);
         if (validArrays.length === 0)
             return [];
         const mergeMap = new Map();
-        for (let e of validArrays.flat()) {
-            if (!e)
+        // 2. 扁平化数组并遍历（仅处理有效数组，提升性能）
+        const arr = validArrays.flat();
+        for (let i = 0; i < arr.length; i++) {
+            const item = arr[i];
+            // 3. 空项防御：跳过undefined/null项
+            if (!item)
                 continue;
-            const key = keyExtractor(e);
-            const v = mergeMap.get(key);
-            if (v) {
-                mergeMap.set(key, (0, lodash_es_1.merge)({}, e, v)); // v放在后面，即保留先插入的值
+            const key = keyExtractor(item);
+            const existingItem = mergeMap.get(key);
+            if (existingItem) {
+                // 4. 深度合并：保留先插入的值（existingItem在前，item在后不覆盖）
+                // 使用lodash的merge，保证深度合并；空对象作为目标，避免修改原对象
+                mergeMap.set(key, (0, lodash_es_1.merge)({}, existingItem, item)); // 元素在后的覆盖前面的
             }
             else {
-                mergeMap.set(key, { ...e });
+                // 5. 首次插入：浅拷贝原对象，避免外部修改影响map内数据
+                mergeMap.set(key, Object.assign({}, item));
             }
         }
+        // 6. 转换为数组返回
         return Array.from(mergeMap.values());
     }
 };

package/dist/utils/axios-instance.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const param_builder_1 = require("./param-builder");
@@ -16,7 +25,7 @@ instance.interceptors.request.use(request => {
 }, error => {
     return Promise.reject(error);
 });
-instance.interceptors.response.use(async (response) => {
+instance.interceptors.response.use((response) => __awaiter(void 0, void 0, void 0, function* () {
     if (response.config.responseType === 'blob') {
         const { data } = response;
         if (data.type === 'application/x-download') { // 不是json说明下载成功
@@ -31,11 +40,11 @@ instance.interceptors.response.use(async (response) => {
             return Promise.resolve(response);
         }
         else if (data.type === 'application/json') { // 是json说明有报错
-            response.data = await new Response(data).json();
+            response.data = yield new Response(data).json();
         }
     }
     return response;
-}, error => {
+}), error => {
     return Promise.reject(error);
 });
 exports.default = instance;

package/dist/utils/downloader.js

@@ -1,28 +1,39 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const JSZip = require("jszip");
 const file_utils_1 = require("./file-utils");
 exports.default = {
-    async zip(urls) {
-        const { fetch, URL } = window;
-        if (!fetch) {
-            alert('您的浏览器不支持fetch');
-            return;
-        }
-        urls = [urls].flat(Infinity);
-        const zip = new JSZip();
-        let index = 1;
-        for (const url of urls) {
-            const response = await fetch(url);
-            const blob = await response.blob();
-            zip.file([index++, file_utils_1.default.fileType(url)].filter(e => !!e).join('.'), blob);
-        }
-        zip.generateAsync({ type: 'blob' }).then(blob => {
-            const a = document.createElement('a');
-            a.href = URL.createObjectURL(blob);
-            a.click();
-            URL.revokeObjectURL(a.href);
-            a.remove();
+    zip(urls) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { fetch, URL } = window;
+            if (!fetch) {
+                alert('您的浏览器不支持fetch');
+                return;
+            }
+            urls = [urls].flat(Infinity);
+            const zip = new JSZip();
+            let index = 1;
+            for (const url of urls) {
+                const response = yield fetch(url);
+                const blob = yield response.blob();
+                zip.file([index++, file_utils_1.default.fileType(url)].filter(e => !!e).join('.'), blob);
+            }
+            zip.generateAsync({ type: 'blob' }).then(blob => {
+                const a = document.createElement('a');
+                a.href = URL.createObjectURL(blob);
+                a.click();
+                URL.revokeObjectURL(a.href);
+                a.remove();
+            });
         });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.1.78",
+  "version": "1.1.80",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",