diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index c9cef6b..fcf356e 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -136,7 +136,7 @@ const index: FunctionComponent = (props) => { }); }; const rowSelection = { - columnWidth: 60, hideSelectAll: isDetailTable, + columnWidth: 60, columnTitle: isDetailTable ? "序号" : "", renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ? {index + 1} : originNode), selectedRowKeys: selectedRowKeys, diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx index 61f1fef..bf824a2 100644 --- a/src/pages/reportTable/index.tsx +++ b/src/pages/reportTable/index.tsx @@ -34,6 +34,42 @@ const ReportTable: FC = (props) => { return { ...child, ellipsis: true, render: (text: string, record: any) => { + if(child.dataIndex?.endsWith("increase")){ + let lowerLimitIndex = child.dataIndex.replace("increase", "lowerLimit"); + let upperLimitIndex = child.dataIndex.replace("increase", "upperLimit"); + let rowData = record[child.dataIndex].split(",").join(""); + if (isNaN(parseFloat(rowData))) { + return record[child.dataIndex] + } + if (!isNaN(parseFloat(record[lowerLimitIndex])) && parseFloat(rowData) < parseFloat(record[lowerLimitIndex])) { + return + } + if (!isNaN(parseFloat(record[upperLimitIndex])) && parseFloat(rowData) > parseFloat(record[upperLimitIndex])) { + return + } else { + return `${rowData}` + } + } return