From f767724c304b58d86d2cd211ec9b96a95899bce7 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 10 Oct 2023 09:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/776=E3=80=91=E6=98=BE=E7=A4=BA1?=
 =?UTF-8?q?00=E6=9D=A1/=E9=A1=B5=EF=BC=8C=E5=A4=8D=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=98=BE=E7=A4=BA3=E4=B8=AA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98(=E9=9A=90=E8=97=8F=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/components/TableFooter.vue | 13 ++++++++++++-
 .../Table/src/hooks/useCustomSelection.tsx          |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/src/components/TableFooter.vue b/src/components/Table/src/components/TableFooter.vue
index da0d925..5d23ef9 100644
--- a/src/components/Table/src/components/TableFooter.vue
+++ b/src/components/Table/src/components/TableFooter.vue
@@ -88,7 +88,9 @@
         }
 
         if (hasSelection) {
-          const isFixed = columns.some((col) => col.fixed === 'left');
+          // update-begin--author:liaozhiyang---date:20231009---for：【issues/776】显示100条/页，复选框只能显示3个的问题(fixed也有可能设置true)
+          const isFixed = columns.some((col) => col.fixed === 'left' || col.fixed === true);
+          // update-begin--author:liaozhiyang---date:20231009---for：【issues/776】显示100条/页，复选框只能显示3个的问题(fixed也有可能设置true)
           columns.unshift({
             width: 50,
             title: 'selection',
@@ -116,3 +118,12 @@
     },
   });
 </script>
+<style lang="less" scoped>
+  // update-begin--author:liaozhiyang---date:20231009---for：【issues/776】显示100条/页，复选框只能显示3个的问题(隐藏合计的滚动条)
+  .ant-table-wrapper {
+    :deep(.ant-table-body) {
+      overflow-x: hidden !important;
+    }
+  }
+  // update-end--author:liaozhiyang---date:20231009---for：【issues/776】显示100条/页，复选框只能显示3个的问题(隐藏合计的滚动条)
+</style>
diff --git a/src/components/Table/src/hooks/useCustomSelection.tsx b/src/components/Table/src/hooks/useCustomSelection.tsx
index 70186d6..83013b6 100644
--- a/src/components/Table/src/hooks/useCustomSelection.tsx
+++ b/src/components/Table/src/hooks/useCustomSelection.tsx
@@ -316,7 +316,8 @@ export function useCustomSelection(
   // 自定义渲染Body
   function bodyCustomRender(params) {
     const { index } = params;
-    if (!recordIsShow(index)) {
+    // update-begin--author:liaozhiyang---date:20231009--for：【issues/776】显示100条/页，复选框只能显示3个的问题
+    if (propsRef.value.canResize && !recordIsShow(index)) {
       return '';
     }
     if (isRadio.value) {
@@ -324,6 +325,7 @@ export function useCustomSelection(
     } else {
       return renderCheckboxComponent(params);
     }
+    // update-end--author:liaozhiyang---date:20231009---for：【issues/776】显示100条/页，复选框只能显示3个的问题
   }
 
   /**