Merge pull request #2867 from aqiusen/hotfix/table/2863

fix(table): 修复统计行中选中模式下显示异常问题(#2863)
XiaoMi · Jun 14, 2024 · 841f9ff · 841f9ff
2 parents 9416cd0 + eea2cca
commit 841f9ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.changeset/blue-worms-knock.md b/.changeset/blue-worms-knock.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/table": patch
+---
+
+修复统计行中选中模式下显示异常问题(#2863)
diff --git a/.changeset/tricky-cars-begin.md b/.changeset/tricky-cars-begin.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+fix(table): 修复统计行中选中模式下显示异常问题(#2863)
diff --git a/packages/ui/table/src/BaseTable.tsx b/packages/ui/table/src/BaseTable.tsx
@@ -17,6 +17,7 @@ import { useEmbedExpand, UseEmbedExpandProps } from './hooks/use-embed-expand'
 import { TheadContent } from './TheadContent'
 import { ColGroupContent } from './ColGroupContent'
 import { TbodyContent } from './TbodyContent'
+import { SELECTION_DATA_KEY } from './Table';
 
 const _role = 'table'
 const _prefix = getPrefixCls('table')
@@ -126,7 +127,8 @@ export const BaseTable = forwardRef<HTMLDivElement | null, BaseTableProps>(
       let hasAvgColumn = false
 
       columns.forEach((column, index) => {
-        if (index === 0) {
+        // 行选中模式下，index=0是checkbox列，index=1才是第一列 ; fix issue: https://github.com/XiaoMi/hiui/issues/2863
+        if (index === 0 || (index === 1 && columns[0].dataKey === SELECTION_DATA_KEY)) {
           // @ts-ignore
           avgRow.raw[column.dataKey] = i18n.get('table.average')
         }
@@ -149,7 +151,7 @@ export const BaseTable = forwardRef<HTMLDivElement | null, BaseTableProps>(
       let hasSumColumn = false
 
       columns.forEach((column, index) => {
-        if (index === 0) {
+        if (index === 0  || (index === 1 && columns[0].dataKey === SELECTION_DATA_KEY)) {
           // @ts-ignore
           sumRow.raw[column.dataKey] = i18n.get('table.total')
         }