diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 77b3210..2b27c0c 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -37,6 +37,7 @@ const index: FunctionComponent = (props) => { const [tableScrollHeight, setTableScrollHeight] = useState(0); const [payload, setPayload] = useState(""); const [fixed, setFixed] = useState(true); + const [pageSum, setPageSum] = useState>({}); //当页合计 const [sumRow, setSumRow] = useState>({}); //总计行数据 useEffect(() => { @@ -63,6 +64,7 @@ const index: FunctionComponent = (props) => { fixed = true, tableScrollHeight, sumRow, + pageSum = {}, optWidth } = data; setSumRowlistUrl(sumRowlistUrl); @@ -73,6 +75,7 @@ const index: FunctionComponent = (props) => { setPayload(payload); setFixed(fixed); setSumRow(sumRow); + setPageSum(pageSum); setPageInfo(pageInfo); setDataSource(dataSource); setSelectedRowKeys([...selectedRowKeys, ...rowKeys]); @@ -245,7 +248,7 @@ const index: FunctionComponent = (props) => { }; const rowSelection = { columnWidth: 50, - columnTitle: isDetailTable ? "序号" : "", + columnTitle: isDetailTable ? "序号" : "", renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ? {index + 1} : originNode), selectedRowKeys, preserveSelectedRowKeys: true, @@ -287,6 +290,14 @@ const index: FunctionComponent = (props) => { <> ) : ( + {!_.isEmpty(pageSum) && ( + + + {i18n["当页合计"]} + + + + )} {i18n["总计"]}