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 @@ }, }); + 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个的问题 } /**