From 283df475846fc5a05a52da5dc11632e23170e58c Mon Sep 17 00:00:00 2001
From: sjzt_yjh <179740385@qq.com>
Date: Wed, 20 Dec 2023 22:48:59 +0800
Subject: [PATCH] fix: ColumnSetting about selectedRowKeys override

---
 .../Table/src/components/settings/ColumnSetting.vue           | 4 ++--
 src/components/Table/src/components/settings/index.vue        | 3 ++-
 src/components/Table/src/types/table.ts                       | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index 7af393342e2..91c0d138bce 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -111,7 +111,7 @@
   import { useDesign } from '@/hooks/web/useDesign';
   import { isFunction, isNil } from '@/utils/is';
   import { getPopupContainer as getParentContainer } from '@/utils';
-  import { cloneDeep } from 'lodash-es';
+  import { cloneDeep, omit } from 'lodash-es';
   import Sortablejs from 'sortablejs';
 
   // 列表设置缓存
@@ -492,7 +492,7 @@
     table.setProps({
       rowSelection: showRowSelection
         ? {
-            ...defaultRowSelection,
+            ...omit(defaultRowSelection, ['selectedRowKeys']),
             fixed: true,
           }
         : undefined,
diff --git a/src/components/Table/src/components/settings/index.vue b/src/components/Table/src/components/settings/index.vue
index ec41e9af24e..342bf1b5f69 100644
--- a/src/components/Table/src/components/settings/index.vue
+++ b/src/components/Table/src/components/settings/index.vue
@@ -6,7 +6,7 @@
       v-if="getSetting.setting"
       @columns-change="handleColumnChange"
       :getPopupContainer="getTableContainer"
-      :cache="false"
+      :cache="getSetting.settingCache"
     />
     <FullScreenSetting v-if="getSetting.fullScreen" :getPopupContainer="getTableContainer" />
   </div>
@@ -39,6 +39,7 @@
       redo: true,
       size: true,
       setting: true,
+      settingCache: false,
       fullScreen: false,
       ...props.setting,
     };
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index 9a8ae9d4241..9fa5811347a 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -140,6 +140,7 @@ export interface TableSetting {
   redo?: boolean;
   size?: boolean;
   setting?: boolean;
+  settingCache?: boolean;
   fullScreen?: boolean;
 }