@whitesev/utils 2.9.2 → 2.9.4

package/dist/index.amd.js

@@ -4213,9 +4213,35 @@ define((function () { 'use strict';
 
     class UtilsDictionary {
         items;
-        constructor(key, value) {
+        constructor(...args) {
             this.items = new Map();
-            if (key != null) {
+            if (args.length === 1) {
+                // 数组|对象
+                const data = args[0];
+                if (Array.isArray(data)) {
+                    // 数组
+                    // [[1,2], [3,4], ...]
+                    for (let index = 0; index < data.length; index++) {
+                        const item = data[index];
+                        if (Array.isArray(item)) {
+                            const [key, value] = item;
+                            this.set(key, value);
+                        }
+                    }
+                }
+                else if (typeof data === "object" && data != null) {
+                    // 对象
+                    // {1:2, 3:4}
+                    for (const key in data) {
+                        if (Reflect.has(data, key)) {
+                            this.set(key, data[key]);
+                        }
+                    }
+                }
+            }
+            else if (args.length === 2) {
+                // 键、值
+                const [key, value] = args;
                 this.set(key, value);
             }
         }
@@ -4231,7 +4257,7 @@ define((function () { 'use strict';
         get entries() {
             const that = this;
             return function* () {
-                const itemKeys = Object.keys(that.getItems());
+                const itemKeys = that.keys();
                 for (const keyName of itemKeys) {
                     yield [keyName, that.get(keyName)];
                 }
@@ -4268,7 +4294,7 @@ define((function () { 'use strict';
          */
         set(key, val) {
             if (key === void 0) {
-                throw new Error("Utils.Dictionary().set 参数 key 不能为空");
+                throw new Error("Utils.Dictionary().set 参数 key 不能为undefined");
             }
             this.items.set(key, val);
         }
@@ -5474,7 +5500,7 @@ define((function () { 'use strict';
     }
     const domUtils = new DOMUtils();
 
-    const version = "2.9.2";
+    const version = "2.9.4";
 
     class Utils {
         windowApi;
@@ -7634,30 +7660,34 @@ define((function () { 'use strict';
                 });
             }
         }
-        sortListByProperty(data, getPropertyValueFunc, sortByDesc = true) {
+        sortListByProperty(data, getComparePropertyValue, sortByDesc = true) {
             const that = this;
-            if (typeof getPropertyValueFunc !== "function" && typeof getPropertyValueFunc !== "string") {
+            if (typeof getComparePropertyValue !== "function" && typeof getComparePropertyValue !== "string") {
                 throw new Error("Utils.sortListByProperty 参数 getPropertyValueFunc 必须为 function|string 类型");
             }
             if (typeof sortByDesc !== "boolean") {
                 throw new Error("Utils.sortListByProperty 参数 sortByDesc 必须为 boolean 类型");
             }
-            const getObjValue = function (obj) {
-                return typeof getPropertyValueFunc === "string" ? obj[getPropertyValueFunc] : getPropertyValueFunc(obj);
+            const getTargetValue = function (target) {
+                return typeof getComparePropertyValue === "string"
+                    ? target[getComparePropertyValue]
+                    : getComparePropertyValue(target);
             };
             /**
-             * 排序方法
-             * @param after_obj
-             * @param before_obj
+             * number类型排序方法
+             * @param afterInst
+             * @param beforeInst
              */
-            const sortFunc = function (after_obj, before_obj) {
-                const beforeValue = getObjValue(before_obj); /*  前 */
-                const afterValue = getObjValue(after_obj); /* 后 */
+            const sortFunc = function (afterInst, beforeInst) {
+                const beforeValue = getTargetValue(beforeInst); /*  前 */
+                const afterValue = getTargetValue(afterInst); /* 后 */
                 if (sortByDesc) {
-                    if (afterValue > beforeValue) {
+                    // 降序
+                    // 5、4、3、2、1
+                    if (beforeValue < afterValue) {
                         return -1;
                     }
-                    else if (afterValue < beforeValue) {
+                    else if (beforeValue > afterValue) {
                         return 1;
                     }
                     else {
@@ -7665,10 +7695,12 @@ define((function () { 'use strict';
                     }
                 }
                 else {
-                    if (afterValue < beforeValue) {
+                    // 升序
+                    // 1、2、3、4、5
+                    if (beforeValue > afterValue) {
                         return -1;
                     }
-                    else if (afterValue > beforeValue) {
+                    else if (beforeValue < afterValue) {
                         return 1;
                     }
                     else {
@@ -7677,18 +7709,18 @@ define((function () { 'use strict';
                 }
             };
             /**
-             * 排序元素方法
+             * 元素排序方法
              * @param nodeList 元素列表
              * @param getNodeListFunc 获取元素列表的函数
              */
             const sortNodeFunc = function (nodeList, getNodeListFunc) {
                 const nodeListLength = nodeList.length;
-                for (let i = 0; i < nodeListLength - 1; i++) {
-                    for (let j = 0; j < nodeListLength - 1 - i; j++) {
-                        const beforeNode = nodeList[j];
-                        const afterNode = nodeList[j + 1];
-                        const beforeValue = getObjValue(beforeNode); /*  前 */
-                        const afterValue = getObjValue(afterNode); /* 后 */
+                for (let index = 0; index < nodeListLength - 1; index++) {
+                    for (let index2 = 0; index2 < nodeListLength - 1 - index; index2++) {
+                        const beforeNode = nodeList[index2];
+                        const afterNode = nodeList[index2 + 1];
+                        const beforeValue = getTargetValue(beforeNode); /*  前 */
+                        const afterValue = getTargetValue(afterNode); /* 后 */
                         if ((sortByDesc == true && beforeValue < afterValue) || (sortByDesc == false && beforeValue > afterValue)) {
                             /* 升序/降序 */
                             /* 相邻元素两两对比 */
@@ -7711,7 +7743,9 @@ define((function () { 'use strict';
             let getDataFunc = null;
             if (data instanceof Function) {
                 getDataFunc = data;
-                data = data();
+                const newData = getDataFunc();
+                data = newData;
+                result = newData;
             }
             if (Array.isArray(data)) {
                 data.sort(sortFunc);