diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 0a13326..f2431eb 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -279,6 +279,11 @@ } } } + + .ant-typography { + margin-bottom: 0 !important; + font-size: 12px !important; + } } } diff --git a/src/pages/calcTable/customTableTitle.tsx b/src/pages/calcTable/customTableTitle.tsx index 4b7c306..98907eb 100644 --- a/src/pages/calcTable/customTableTitle.tsx +++ b/src/pages/calcTable/customTableTitle.tsx @@ -41,10 +41,16 @@ const customTableTitle: FunctionComponent = (props) => { { !!lockStatus && !calcDetail &&
- handleToggleSalaryItemVal(dataIndex as string, "LOCK")}/> - handleToggleSalaryItemVal(dataIndex as string, "UNLOCK")}/> + { + lockStatus === "UNLOCK" && + handleToggleSalaryItemVal(dataIndex as string, "LOCK")}/> + } + { + lockStatus === "LOCK" && + handleToggleSalaryItemVal(dataIndex as string, "UNLOCK")}/> + } handleToggleSalaryItemVal(dataIndex as string, "DIAGRAM")}/> { const [columns, setColumns] = useState>([]); const [sumRow, setSumRow] = useState>({}); const [dataSource, setDataSource] = useState>([]); const [showSumrow, setShowSumrow] = useState(false); + const [SSHeaderInfo, setSSHeaderInfo] = useState(""); useEffect(() => { window.parent.postMessage({ type: "init" }, "*"); @@ -20,10 +21,11 @@ const ReportTable: FC = (props) => { const receiveMessageFromIndex = (event: any) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { - const { columns, dataSource, countResult, showSum } = data; + const { columns, dataSource, countResult, showSum, SSHeaderInfo = "" } = data; setDataSource(dataSource); setShowSumrow(showSum); setSumRow(countResult); + setSSHeaderInfo(SSHeaderInfo); setColumns(_.map(columns, (item, index: number) => { if (index === 0) { return { ...item, fixed: "left", ellipsis: true }; @@ -34,12 +36,12 @@ const ReportTable: FC = (props) => { return { ...child, ellipsis: true, render: (text: string, record: any) => { - if(child.dataIndex?.endsWith("increase")){ + 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(""); + let rowData = !_.isEmpty(record[child.dataIndex]) ? record[child.dataIndex].split(",").join("") : ""; if (isNaN(parseFloat(rowData))) { - return record[child.dataIndex] + 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 `${rowData}`; } } return