From 59b309aa7e0049f0ade0b5ee932f146c5bdb8dfc Mon Sep 17 00:00:00 2001
From: HUCHAOQI <hyperq1g@gmail.com>
Date: Wed, 10 Nov 2021 21:45:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(table):=20=E4=BD=BF=E7=94=A8lodash=20?=
 =?UTF-8?q?=E7=9A=84merge=E6=9D=A5=E9=80=92=E5=BD=92assign,=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=9C=A8=E5=A4=9A=E5=AF=B9=E8=B1=A1=E5=B5=8C=E5=A5=97?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E7=BB=93=E6=9E=84=20(#1350?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Table/src/hooks/useDataSource.ts          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts
index 76cba22aa..cba5b3076 100644
--- a/src/components/Table/src/hooks/useDataSource.ts
+++ b/src/components/Table/src/hooks/useDataSource.ts
@@ -14,7 +14,7 @@ import {
 import { useTimeoutFn } from '/@/hooks/core/useTimeout';
 import { buildUUID } from '/@/utils/uuid';
 import { isFunction, isBoolean } from '/@/utils/is';
-import { get, cloneDeep } from 'lodash-es';
+import { get, cloneDeep, merge } from 'lodash-es';
 import { FETCH_SETTING, ROW_KEY, PAGE_SIZE } from '../const';
 
 interface ActionType {
@@ -272,17 +272,17 @@ export function useDataSource(
 
       const { sortInfo = {}, filterInfo } = searchState;
 
-      let params: Recordable = {
-        ...pageParams,
-        ...(useSearchForm ? getFieldsValue() : {}),
-        ...searchInfo,
-        ...(opt?.searchInfo ?? {}),
-        ...defSort,
-        ...sortInfo,
-        ...filterInfo,
-        ...(opt?.sortInfo ?? {}),
-        ...(opt?.filterInfo ?? {}),
-      };
+      let params: Recordable = merge(
+        pageParams,
+        useSearchForm ? getFieldsValue() : {},
+        searchInfo,
+        opt?.searchInfo ?? {},
+        defSort,
+        sortInfo,
+        filterInfo,
+        opt?.sortInfo ?? {},
+        opt?.filterInfo ?? {},
+      );
       if (beforeFetch && isFunction(beforeFetch)) {
         params = (await beforeFetch(params)) || params;
       }