From a67f074690349e0216e6aa3c81c3dacfe813a3ca Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 1 Dec 2023 21:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/5595=E3=80=91BasicTable?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6hideSelectAll:=20true=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=85=A8=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Table/src/components/CustomSelectHeader.vue     | 13 ++++++++++++-
 .../Table/src/hooks/useCustomSelection.tsx          |  7 +++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/src/components/CustomSelectHeader.vue b/src/components/Table/src/components/CustomSelectHeader.vue
index 437b0e7..7a385e4 100644
--- a/src/components/Table/src/components/CustomSelectHeader.vue
+++ b/src/components/Table/src/components/CustomSelectHeader.vue
@@ -1,10 +1,17 @@
 <!-- 自定义选择列，表头实现部分 -->
 <template>
+  <!-- update-begin--author:liaozhiyang---date:20231130---for：【issues/5595】BasicTable组件hideSelectAll: true无法隐藏全选框 -->
   <template v-if="isRadio">
     <!-- radio不存在全选，所以放个空标签 -->
     <span></span>
   </template>
-  <a-checkbox :disabled="disabled" v-else :checked="checked" :indeterminate="isHalf" @update:checked="onChange" />
+  <template v-else>
+    <template v-if="hideSelectAll">
+      <span></span>
+    </template>
+    <a-checkbox :disabled="disabled" v-else :checked="checked" :indeterminate="isHalf" @update:checked="onChange" />
+  </template>
+  <!-- update-end--author:liaozhiyang---date:20231130---for：【issues/5595】BasicTable组件hideSelectAll: true无法隐藏全选框 -->
 </template>
 <script setup lang="ts">
   import { computed } from 'vue';
@@ -23,6 +30,10 @@
       type: Number,
       required: true,
     },
+    hideSelectAll: {
+      type: Boolean,
+      default: false,
+    },
     // update-begin--author:liaozhiyang---date:20231016---for：【QQYUN-6774】解决checkbox禁用后全选仍能勾选问题
     disabled: {
       type: Boolean,
diff --git a/src/components/Table/src/hooks/useCustomSelection.tsx b/src/components/Table/src/hooks/useCustomSelection.tsx
index a883b13..b3b1070 100644
--- a/src/components/Table/src/hooks/useCustomSelection.tsx
+++ b/src/components/Table/src/hooks/useCustomSelection.tsx
@@ -123,6 +123,7 @@ export function useCustomSelection(
       pageSize: currentPageSize.value,
       // 【QQYUN-6774】解决checkbox禁用后全选仍能勾选问题
       disabled: flattedData.value.length == 0,
+      hideSelectAll: unref(propsRef)?.rowSelection?.hideSelectAll,
     };
   });
 
@@ -130,8 +131,10 @@ export function useCustomSelection(
   watch(
     () => unref(propsRef)?.rowSelection?.selectedRowKeys,
     (val: string[]) => {
-      if (Array.isArray(val)) {
-        setSelectedRowKeys(val);
+      // 解决selectedRowKeys在页面调用处使用ref失效
+      const value = unref(val);
+      if (Array.isArray(value)) {
+        setSelectedRowKeys(value);
       }
     },
     { immediate: true }