qmwts 1.1.74 → 1.1.76

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

@@ -26,10 +26,10 @@ declare const _default: {
     /**
      * 根据数组元素中的某一属性进行去重
      * @param array
-     * @param keyName
+     * @param value 获取元素唯一标识的函数
      * @param override 遇到重复元素是否覆盖
      */
-    uniqueBy<T>(array: T[] | undefined, keyName: string, override?: boolean): T[];
+    uniqueBy<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;
 };
 export default _default;

package/dist/utils/array-utils.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const object_utils_1 = require("./object-utils");
 exports.default = {
     /**
      * 数组转化为树形结构
@@ -14,8 +13,11 @@ exports.default = {
         const ids = []; // 记录所有的id，parentId不在这个集合内则说明是最上级
         const length = array.length;
         for (let i = 0; i < length; i++) {
-            const e = array[i], id = e[idKey], pid = e[parentKey];
-            const children = map.get(pid) || [];
+            const e = array[i];
+            if (e == null)
+                continue;
+            const id = e[idKey], pid = e[parentKey];
+            const children = map.get(pid) ?? [];
             children.push(e);
             map.set(pid, children);
             ids.push(id);
@@ -84,18 +86,17 @@ exports.default = {
     /**
      * 根据数组元素中的某一属性进行去重
      * @param array
-     * @param keyName
+     * @param value 获取元素唯一标识的函数
      * @param override 遇到重复元素是否覆盖
      */
-    uniqueBy(array = [], keyName, override = false) {
+    uniqueBy(array = [], value, override = false) {
+        array = array ?? [];
         const map = new Map();
-        const length = array.length;
-        for (let i = 0; i < length; i++) {
+        for (let i = 0; i < array.length; i++) {
             const e = array[i];
-            const key = object_utils_1.default.optionalChaining(e, keyName);
-            if (!override && map.has(key))
-                continue;
-            map.set(key, e);
+            const key = value(e);
+            if (!map.has(key) || override)
+                map.set(key, e);
         }
         return Array.from(map.values());
     },

package/package.json

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