diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx index 41e9c3a..12800fe 100644 --- a/src/pages/reportTable/index.tsx +++ b/src/pages/reportTable/index.tsx @@ -32,19 +32,30 @@ const PreviewTable: FC = (props) => { className={styles.tableWrapper} columns={columns} dataSource={dataSource} + pagination={false} bordered size="small" + scroll={{ x: 1200, y: `calc(100vh - 109px)` }} summary={() => { if (!showSumrow) return; + let totalColumns: any[] = []; + _.forEach(columns, it => { + if (!it.children) { + totalColumns.push(it); + } else { + totalColumns = [...totalColumns, ...it.children]; + } + }); return ( { - _.map(columns, (item, index) => { + _.map([{}, ...totalColumns], (item, index) => { if (index === 0) { - return 总计; + return 总计; } - return + return {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} ; })