fix(shared): Fix merge undefined is not work (#1009)

alibaba · Sep 4, 2020 · 40489ac · 40489ac
1 parent 5dde72a
commit 40489ac
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/shared/src/merge.ts b/packages/shared/src/merge.ts
@@ -89,7 +89,7 @@ function propertyIsUnsafe(target, key) {
 }
 
 function mergeObject(target: any, source: any, options: Options) {
-  const destination = options.assign ? target : {}
+  const destination = options.assign ? target || {} : {}
   if (!options.isMergeableObject(target)) return target
   if (!options.assign) {
     getKeys(target).forEach(function(key) {
@@ -100,6 +100,9 @@ function mergeObject(target: any, source: any, options: Options) {
     if (propertyIsUnsafe(target, key)) {
       return
     }
+    if (!target[key]) {
+      destination[key] = source[key]
+    }
     if (
       propertyIsOnObject(target, key) &&
       options.isMergeableObject(source[key])