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

fix(deepMerge): 修复递归合并操作, 合并数组未去重的bug (#2667) 

Co-authored-by: 苗大 <caoshengmiao@hypergryph.com>
This commit is contained in:
Cherelle Spencer 2023-04-04 16:59:30 +08:00 committed by GitHub
parent 02d41197b6
commit 4418eccfab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/index.ts
View File

@ -3,7 +3,7 @@ import type { App, Component } from 'vue';
import { unref } from 'vue';
import { isArray, isObject } from '/@/utils/is';
import { cloneDeep, mergeWith } from 'lodash-es';
import { cloneDeep, isEqual, mergeWith, unionWith } from 'lodash-es';
export const noop = () => {};
@ -48,7 +48,8 @@ export function deepMerge<T extends object | null | undefined, U extends object
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;
// 如果是数组，合并数组(去重) If it is an array, merge the array (remove duplicates)
return isArray(prevValue) ? unionWith(prevValue, nextValue, isEqual) : undefined;
});
}
});