@whitesev/utils 2.9.6 → 2.9.8

package/dist/index.amd.js

@@ -312,38 +312,44 @@ define((function () { 'use strict';
             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;
@@ -440,6 +446,9 @@ define((function () { 'use strict';
         }
         toJSON(data, errorCallBack) {
             let result = {};
+            if (data == null) {
+                return result;
+            }
             if (typeof data === "object") {
                 return data;
             }
@@ -5492,7 +5501,7 @@ define((function () { 'use strict';
     }
     const domUtils = new DOMUtils();
 
-    const version = "2.9.6";
+    const version = "2.9.8";
 
     class Utils {
         windowApi;
@@ -8030,7 +8039,7 @@ define((function () { 'use strict';
             }
         }
         /**
-         * 深度获取对象属性
+         * 深度获取对象的某个属性
          * @param target 待获取的对象
          * @param handler 获取属性的回调
          */