From 9a63ffe0d28a59fd789e0738c420fcd9c9a4032a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 16 Apr 2024 18:17:31 +0800 Subject: [PATCH] master --- src/pages/unitTable/index.tsx | 23 +++++++++++++++++++---- src/pages/unitTable/renderColsOpts.tsx | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx index a9a3f8f..ae404f5 100644 --- a/src/pages/unitTable/index.tsx +++ b/src/pages/unitTable/index.tsx @@ -1,22 +1,26 @@ import React, { FC, useEffect, useState } from "react"; -import { Table } from "antd"; +import { Table, Typography } from "antd"; import { PaginationData } from "rc-pagination"; import { exceptStr, paginationAction } from "@/utils/common"; import { renderCols } from "@/pages/unitTable/renderColsOpts"; +import CaclFixedTotal from "@/pages/calcTable/calcFixedTotal"; import styles from "./index.less"; +const { Text } = Typography; export type extraType = { selectedKey: string; selectedRowKeys: string[] | number[]; permission: boolean; scrollHeight: number; - rowKey: string + rowKey: string; + showTotalCell: boolean } const UnitTable: FC = (props) => { const [unitTableType, setUnitTableType] = useState(""); const [columns, setColumns] = useState>([]); const [dataSource, setDataSource] = useState>([]); const [pageInfo, setPageInfo] = useState>({}); + const [sumRow, setSumRow] = useState>({});//总计行数据 const [i18n, setI18n] = useState({}); const [extraParams, setExtraParams] = useState>({});//额外参数 @@ -32,14 +36,15 @@ const UnitTable: FC = (props) => { if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, scrollHeight, i18n, showOperateBtn: permission, unitTableType = "welfareRecord", - selectedRowKeys, selectedKey, rowKey + selectedRowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {} } = data; setI18n(i18n); setColumns(columns); setDataSource(dataSource); setPageInfo(pageInfo); setUnitTableType(unitTableType); - setExtraParams({ selectedKey, selectedRowKeys, scrollHeight, permission, rowKey }); + setSumRow(sumDataSource); + setExtraParams({ selectedKey, selectedRowKeys, scrollHeight, permission, rowKey, showTotalCell }); } }; const onChange = (current: number, pageSize: number) => { @@ -74,6 +79,16 @@ const UnitTable: FC = (props) => { ...paginationAction(pageInfo, i18n, onChange), size: "default" } : false} + summary={() => ( + !extraParams.showTotalCell ? <> : + + + {i18n["总计"]} + + + + )} />; }; diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index 30eb11e..59d2fa6 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -296,7 +296,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, } }]; } - return []; + return initialState; }, [initialState, type, i18n, extraParams]); }