Merge pull request #200 from VisActor/fix/merge-error

Fix/merge error
VisActor · Aug 20, 2024 · cc8452b · cc8452b
2 parents 993e36a + 11ed0da
commit cc8452b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/common/changes/@visactor/vutils/fix-merge-error_2024-08-20-05-23.json b/common/changes/@visactor/vutils/fix-merge-error_2024-08-20-05-23.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vutils",
+      "comment": "fix: merge error for invalid value",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vutils"
+}
diff --git a/packages/vutils/src/common/merge.ts b/packages/vutils/src/common/merge.ts
@@ -70,7 +70,7 @@ function baseMergeDeep(
   // }
   // 不考虑 argument 类型
   else if (isPlainObject(srcValue)) {
-    newValue = objValue;
+    newValue = objValue ?? {};
     // 不考虑 prototype 的额外处理
     if (typeof objValue === 'function' || typeof objValue !== 'object') {
       newValue = {};