From 7ca007ecd510379d7c1b1fc7be98e83074371dca Mon Sep 17 00:00:00 2001 From: luojz <74349832+coderluojz@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:15:44 +0800 Subject: [PATCH] fix(deepMerge): fix recursive merge data without removing duplicate bugs (#2831) Co-authored-by: luojingzhou --- src/utils/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 945ed086..301226b1 100644 --- a/src/utils/index.ts +++ b/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 { // 如果是数组,合并数组(去重) 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; }); } });