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

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[]) => {