From c8dabd2918a99cbe7ba0d18bcb1bd41d240bad68 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 25 Feb 2025 15:22:10 +0800
Subject: [PATCH] master

---
 src/pages/calcTable/calcFixedTotal.tsx | 2 +-
 src/pages/calcTable/index.tsx          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/calcTable/calcFixedTotal.tsx b/src/pages/calcTable/calcFixedTotal.tsx
index 6e61bbd..b450542 100644
--- a/src/pages/calcTable/calcFixedTotal.tsx
+++ b/src/pages/calcTable/calcFixedTotal.tsx
@@ -61,7 +61,7 @@ const calcFixedTotal: FunctionComponent<Props> = (props) => {
         return <Table.Summary.Cell index={index + 1} key={index + 1} align={_.head(columns)?.align || "left"}>
           {
             loading ? <Spin spinning={loading} size="small"></Spin> :
-              <Text type="danger">{!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"}</Text>
+              <Text type="danger">{(sumRow && !_.isNil(sumRow[item.dataIndex])) ? sumRow[item.dataIndex] : "-"}</Text>
           }
         </Table.Summary.Cell>;
       })
diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx
index c2d96ac..0e74e6d 100644
--- a/src/pages/calcTable/index.tsx
+++ b/src/pages/calcTable/index.tsx
@@ -239,9 +239,9 @@ const index: FunctionComponent<Props> = (props) => {
     });
   };
   const rowSelection = {
-    columnWidth: 60,
-    columnTitle: isDetailTable && !showTotalCell ? "序号" : "",
-    renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable && !showTotalCell ? <span>{index + 1}</span> : originNode),
+    columnWidth: 50,
+    columnTitle: isDetailTable  ? "序号" : "",
+    renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ? <span>{index + 1}</span> : originNode),
     selectedRowKeys,
     preserveSelectedRowKeys: true,
     onChange: (rowKeys: React.Key[]) => {