Browse Source

fix(deepMerge): fix recursive merge data without removing duplicate bugs (#2831)

Co-authored-by: luojingzhou <luojingzhou@kezaihui.com>
pull/2834/head
luojz 3 years ago
committed by GitHub
parent
commit
7ca007ecd5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  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 = () => {};
@ -49,7 +49,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;
});
}
});

Loading…
Cancel
Save