github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-01-25 02:58:43 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(deepMerge): 去掉合并错误的代码 (#2848)

Browse Source
This commit is contained in:
Kirk Lin 2023-06-10 17:19:18 +08:00 committed by GitHub
parent 9c43c74131
commit 1f287145f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/index.ts
View File

@ -52,14 +52,6 @@ export function deepMerge<T extends object | null | undefined, U extends object
target: U, target: U,
mergeArrays: 'union' | 'intersection' | 'concat' | 'replace' = 'replace', mergeArrays: 'union' | 'intersection' | 'concat' | 'replace' = 'replace',
): T & U { ): T & U {
return mergeWith(cloneDeep(target), source, (objValue, srcValue) => {
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;
});
if (!target) { if (!target) {
return source as T & U; return source as T & U;
} }