refactor: deepMerge (#2649)

Kirk Lin · GitHub
1 parent 5d8d9786
Showing 1 changed file with 21 additions and 10 deletions
src/utils/index.ts
@@ -2,8 +2,8 @@ import type { RouteLocationNormalized, RouteRecordNormalized } from &#39;vue-router&#39;
 import type { App, Component } from 'vue';
  
 import { unref } from 'vue';
-import { isObject } from '/@/utils/is';
-import { cloneDeep } from 'lodash-es';
+import { isArray, isObject } from '/@/utils/is';
+import { cloneDeep, mergeWith } from 'lodash-es';
  
 export const noop = () => {};
  
@@ -33,14 +33,25 @@ export function setObjToUrlParams(baseUrl: string, obj: any): string {
   return /\?$/.test(baseUrl) ? baseUrl + parameters : baseUrl.replace(/\/?$/, '?') + parameters;
 }
  
-// 深度合并
-export function deepMerge<T = any>(src: any = {}, target: any = {}): T {
-  let key: string;
-  const res: any = cloneDeep(src);
-  for (key in target) {
-    res[key] = isObject(res[key]) ? deepMerge(res[key], target[key]) : target[key];
-  }
-  return res;
+/**
+
+ 递归合并两个对象。
+ Recursively merge two objects.
+ @param target 目标对象，合并后结果存放于此。The target object to merge into.
+ @param source 要合并的源对象。The source object to merge from.
+ @returns 合并后的对象。The merged object.
+ */
+export function deepMerge<T extends object | null | undefined, U extends object | null | undefined>(
+  target: T,
+  source: U,
+): T & U {
+  return mergeWith(cloneDeep(target), source, (objValue, srcValue) => {
+    if (isObject(objValue) && isObject(srcValue)) {
+      return mergeWith(cloneDeep(objValue), srcValue, (prevValue, nextValue) => {
+        return isArray(prevValue) ? prevValue.concat(nextValue) : undefined;
+      });
+    }
+  });
 }
  
 export function openWindow(