Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图

2024-03-27 15:48:08 +08:00 · 2024-03-27 15:48:08 +08:00 · 2708ff3dc5
parent db6bbd8bfa 64d3b211da
commit 2708ff3dc5
1 changed files with 2 additions and 2 deletions
--- a/src/pages/calcTable/index.tsx
+++ b/src/pages/calcTable/index.tsx
@ -136,8 +136,8 @@ const index: FunctionComponent<Props> = (props) => {
    });
  };
  const rowSelection = {
-    columnWidth: 60, columnTitle: isDetailTable ? "序号" : "",
-    renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ?
+    columnWidth: 60, columnTitle: (isDetailTable && !showTotalCell) ? "序号" : "",
+    renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => ((isDetailTable && !showTotalCell) ?
      <span>{index + 1}</span> : originNode),
    selectedRowKeys: selectedRowKeys,
    onChange: (selectedRowKeys: React.Key[]) => {