zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Co-authored-by: luojingzhou <luojingzhou@kezaihui.com>
This commit is contained in:
luojz 2023-06-06 14:15:44 +08:00 committed by GitHub
parent 361a189f6a
commit 7ca007ecd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/index.ts
View File

@ -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;
});
}
});