@whitesev/utils 2.9.6 → 2.9.8

package/dist/types/src/Utils.d.ts

@@ -1425,11 +1425,15 @@ declare class Utils {
      */
     watchObject(target: any, propertyName: string, getCallBack: (value: any) => void, setCallBack: (value: any) => void): void;
     /**
-     * 深度获取对象属性
+     * 深度获取对象的某个属性
      * @param target 待获取的对象
      * @param handler 获取属性的回调
      */
-    queryProperty<T = any>(target: any, handler: (target: T) => {
+    queryProperty<T = any>(target: any, handler: (
+    /**
+     * 该值为返回的data值
+     */
+    target: T) => {
         /**
          * 是否是需要的属性
          * + `true` 将目标值赋值给data

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.9.6",
+  "version": "2.9.8",
   "type": "module",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
@@ -39,24 +39,24 @@
     "worker-timers": "^8.0.25"
   },
   "devDependencies": {
-    "@eslint/js": "^9.38.0",
-    "@rollup/plugin-commonjs": "^28.0.9",
+    "@eslint/js": "^9.39.1",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",
-    "browserslist": "^4.27.0",
-    "caniuse-lite": "^1.0.30001751",
-    "eslint": "^9.38.0",
+    "browserslist": "^4.28.0",
+    "caniuse-lite": "^1.0.30001756",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-compat": "^6.0.2",
     "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.4.0",
-    "rollup": "^4.52.5",
+    "globals": "^16.5.0",
+    "rollup": "^4.53.3",
     "rollup-plugin-clear": "^2.0.7",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.2"
+    "typescript-eslint": "^8.47.0"
   },
   "scripts": {
     "lint": "eslint .",

package/src/CommonUtil.ts

@@ -33,41 +33,43 @@ class CommonUtil {
     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);
       }
     }
 
@@ -233,6 +235,9 @@ class CommonUtil {
   toJSON<T = any>(data: string | null, errorCallBack?: (error: Error) => void): T;
   toJSON<T = any>(data: string | null, errorCallBack?: (error: Error) => void): T {
     let result: any = {};
+    if (data == null) {
+      return result as T;
+    }
     if (typeof data === "object") {
       return data as T;
     }

package/src/Utils.ts

@@ -3563,13 +3563,18 @@ class Utils {
     }
   }
   /**
-   * 深度获取对象属性
+   * 深度获取对象的某个属性
    * @param target 待获取的对象
    * @param handler 获取属性的回调
    */
   queryProperty<T = any>(
     target: any,
-    handler: (target: T) => {
+    handler: (
+      /**
+       * 该值为返回的data值
+       */
+      target: T
+    ) => {
       /**
        * 是否是需要的属性
        * + `true` 将目标值赋值给data