opt: opt utils.merge and utils.clone

klinecharts · Nov 5, 2023 · ece5cca · ece5cca
1 parent 841b51a
commit ece5cca
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/common/utils/typeChecks.ts b/src/common/utils/typeChecks.ts
@@ -22,22 +22,20 @@ export function merge (target: any, source: any): void {
       const sourceProp = source[key]
       if (
         isObject(sourceProp) &&
-        isObject(targetProp) &&
-        !isArray(sourceProp) &&
-        !isArray(targetProp)
+        isObject(targetProp)
       ) {
         merge(targetProp, sourceProp)
       } else {
         if (isValid(source[key])) {
-          target[key] = source[key]
+          target[key] = clone(source[key])
         }
       }
     }
   }
 }
 
 export function clone<T> (target: T): T {
-  if (!isObject(target) || !isArray(target)) {
+  if (!isObject(target)) {
     return target
   }
 
@@ -69,7 +67,7 @@ export function isFunction<T = (...args: any) => any> (value: any): value is T {
 }
 
 export function isObject (value: any): value is object {
-  return (typeof value === 'object')
+  return (typeof value === 'object') && isValid(value)
 }
 
 export function isNumber (value: any): value is number {