@whitesev/utils 2.9.5 → 2.9.7

package/dist/index.umd.js

@@ -83,6 +83,9 @@
             if (typeof level !== "number") {
                 level = Number(level);
             }
+            if (isNaN(level)) {
+                throw new TypeError(`输入错误的level：${level}`);
+            }
             const rgbc = this.hexToRgb(color);
             for (let index = 0; index < 3; index++) {
                 const rgbcItemValue = rgbc[index];
@@ -103,6 +106,9 @@
             if (typeof level !== "number") {
                 level = Number(level);
             }
+            if (isNaN(level)) {
+                throw new TypeError(`输入错误的level：${level}`);
+            }
             const rgbc = this.hexToRgb(color);
             for (let index = 0; index < 3; index++) {
                 const rgbcItemValue = Number(rgbc[index]);
@@ -310,38 +316,44 @@
             if (target == null) {
                 target = {};
             }
+            // 当前遍历的目标对象
+            let iteratorTarget;
             if (isAdd) {
-                for (const sourceKeyName in source) {
-                    const targetKeyName = sourceKeyName;
-                    const targetValue = Reflect.get(target, targetKeyName);
-                    const sourceValue = Reflect.get(source, sourceKeyName);
-                    if (typeof sourceValue === "object" &&
-                        sourceValue != null &&
-                        sourceKeyName in target &&
-                        !UtilsContext.isDOM(sourceValue)) {
-                        /* 源端的值是object类型，且不是元素节点 */
-                        Reflect.set(target, sourceKeyName, UtilsContext.assign(targetValue, sourceValue, isAdd));
-                        continue;
-                    }
-                    Reflect.set(target, sourceKeyName, sourceValue);
-                }
+                // 追加并覆盖是以source为准
+                iteratorTarget = source;
             }
             else {
-                for (const targetKeyName in target) {
-                    if (targetKeyName in source) {
-                        const targetValue = Reflect.get(target, targetKeyName);
-                        const sourceValue = Reflect.get(source, targetKeyName);
-                        if (typeof sourceValue === "object" &&
-                            sourceValue != null &&
-                            !UtilsContext.isDOM(sourceValue) &&
-                            Object.keys(sourceValue).length) {
-                            /* 源端的值是object类型，且不是元素节点 */
-                            Reflect.set(target, targetKeyName, UtilsContext.assign(targetValue, sourceValue, isAdd));
-                            continue;
+                // 覆盖以target为准
+                iteratorTarget = target;
+            }
+            for (const keyName in iteratorTarget) {
+                if (!isAdd && !(keyName in source)) {
+                    // 仅替换 但是源端没有此键
+                    continue;
+                }
+                const targetValue = Reflect.get(target, keyName);
+                const sourceValue = Reflect.get(source, keyName);
+                if (typeof sourceValue === "object" &&
+                    sourceValue != null &&
+                    keyName in target &&
+                    !UtilsContext.isDOM(sourceValue)) {
+                    // 源端的值是object类型，且不是元素节点
+                    // 如果是数组，那此数组中有值，清空旧的数组再赋值
+                    let childObjectValue;
+                    if (Array.isArray(sourceValue)) {
+                        if (Array.isArray(targetValue)) {
+                            targetValue.length = 0;
                         }
-                        /* 直接赋值 */
-                        Reflect.set(target, targetKeyName, sourceValue);
+                        childObjectValue = sourceValue;
+                    }
+                    else {
+                        childObjectValue = UtilsContext.assign(targetValue, sourceValue, isAdd);
                     }
+                    Reflect.set(target, keyName, childObjectValue);
+                }
+                else {
+                    /* 直接赋值 */
+                    Reflect.set(target, keyName, sourceValue);
                 }
             }
             return target;
@@ -586,7 +598,7 @@
             }
         }
         /**
-         *  获取多组Cookie
+         * 获取多组Cookie
          * @param option 配置
          **/
         getList(option) {
@@ -699,7 +711,8 @@
             }
         }
         /**
-         * 解析cookie字符串
+         * 解析cookie字符串，按`;`分割
+         *
          * 例如：document.cookie
          * @param cookieStr
          */
@@ -2116,31 +2129,31 @@
         }
         /**
          * 设置当enable为true时默认显示在菜单中前面的emoji图标
-         * @param emojiString
+         * @param emojiString emoji字符串
          */
         setEnableTrueEmoji(emojiString) {
             if (typeof emojiString !== "string") {
-                throw new Error("参数emojiString必须是string类型");
+                throw new TypeError("参数emojiString必须是string类型");
             }
             this.MenuHandle.$emoji.success = emojiString;
         }
         /**
          * 设置当enable为false时默认显示在菜单中前面的emoji图标
-         * @param emojiString
+         * @param emojiString emoji字符串
          */
         setEnableFalseEmoji(emojiString) {
             if (typeof emojiString !== "string") {
-                throw new Error("参数emojiString必须是string类型");
+                throw new TypeError("参数emojiString必须是string类型");
             }
             this.MenuHandle.$emoji.error = emojiString;
         }
         /**
          * 设置本地存储的菜单外部的键名
-         * @param keyName
+         * @param keyName 键名
          */
         setLocalStorageKeyName(keyName) {
             if (typeof keyName !== "string") {
-                throw new Error("参数keyName必须是string类型");
+                throw new TypeError("参数keyName必须是string类型");
             }
             this.MenuHandle.$data.key = keyName;
         }
@@ -5489,7 +5502,7 @@
     }
     const domUtils = new DOMUtils();
 
-    const version = "2.9.5";
+    const version = "2.9.7";
 
     class Utils {
         windowApi;