@whitesev/utils 1.5.9 → 1.6.1

package/dist/index.esm.js

@@ -3276,14 +3276,14 @@ const TryCatch = function (...args) {
 };
 
 class UtilsDictionary {
-    #items = {};
+    items = {};
     constructor() { }
     /**
      * 检查是否有某一个键
      * @param key 键
      */
     has(key) {
-        return this.#items.hasOwnProperty(key);
+        return this.items.hasOwnProperty(key);
     }
     /**
      * 检查已有的键中是否以xx开头
@@ -3307,7 +3307,7 @@ class UtilsDictionary {
         let result = null;
         for (const keyName of allKeys) {
             if (keyName.startsWith(key)) {
-                result = this.#items[keyName];
+                result = this.items[keyName];
                 break;
             }
         }
@@ -3322,7 +3322,7 @@ class UtilsDictionary {
         if (key === void 0) {
             throw new Error("Utils.Dictionary().set 参数 key 不能为空");
         }
-        this.#items[key] = val;
+        this.items[key] = val;
     }
     /**
      * 删除某一个键
@@ -3330,7 +3330,7 @@ class UtilsDictionary {
      */
     delete(key) {
         if (this.has(key)) {
-            Reflect.deleteProperty(this.#items, key);
+            Reflect.deleteProperty(this.items, key);
             return true;
         }
         return false;
@@ -3358,8 +3358,8 @@ class UtilsDictionary {
      * 清空字典
      */
     clear() {
-        this.#items = void 0;
-        this.#items = {};
+        this.items = void 0;
+        this.items = {};
     }
     /**
      * 获取字典的长度
@@ -3377,14 +3377,14 @@ class UtilsDictionary {
      * 返回字典本身
      */
     getItems() {
-        return this.#items;
+        return this.items;
     }
     /**
      * 合并另一个字典
      * @param data 需要合并的字典
      */
     concat(data) {
-        this.#items = utils.assign(this.#items, data.getItems());
+        this.items = utils.assign(this.items, data.getItems());
     }
     forEach(callbackfn) {
         for (const key in this.getItems()) {
@@ -3461,13 +3461,20 @@ class Utils {
                 return source;
             }
         }
+        if (source == null) {
+            return target;
+        }
+        if (target == null) {
+            target = {};
+        }
         if (isAdd) {
             for (const sourceKeyName in source) {
                 const targetKeyName = sourceKeyName;
                 let targetValue = target[targetKeyName];
                 let sourceValue = source[sourceKeyName];
-                if (sourceKeyName in target &&
-                    typeof sourceValue === "object" &&
+                if (typeof sourceValue === "object" &&
+                    sourceValue != null &&
+                    sourceKeyName in target &&
                     !UtilsContext.isDOM(sourceValue)) {
                     /* 源端的值是object类型，且不是元素节点 */
                     target[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
@@ -3482,6 +3489,7 @@ class Utils {
                     let targetValue = target[targetKeyName];
                     let sourceValue = source[targetKeyName];
                     if (typeof sourceValue === "object" &&
+                        sourceValue != null &&
                         !UtilsContext.isDOM(sourceValue) &&
                         Object.keys(sourceValue).length) {
                         /* 源端的值是object类型，且不是元素节点 */