Browse Source

fix(deepMerge): fix deepMerge

main
xingyu 2 years ago
parent
commit
23cf34f78e
  1. 6
      src/utils/index.ts

6
src/utils/index.ts

@ -1,9 +1,9 @@
import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router'
import type { App, Component } from 'vue'
import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router'
import { cloneDeep, mergeWith, uniq } from 'lodash-es'
import { unref } from 'vue'
import { isArray, isObject } from '@/utils/is'
import { cloneDeep, isEqual, mergeWith, unionWith } from 'lodash-es'
export const noop = () => {}
@ -45,7 +45,7 @@ export function deepMerge<T extends object | null | undefined, U extends object
if (isObject(objValue) && isObject(srcValue)) {
return mergeWith(cloneDeep(objValue), srcValue, (prevValue, nextValue) => {
// 如果是数组,合并数组(去重) If it is an array, merge the array (remove duplicates)
return isArray(prevValue) ? unionWith(prevValue, nextValue, isEqual) : undefined
return isArray(prevValue) ? uniq(prevValue, nextValue) : undefined
})
}
})