From b992c06a21b578f2795541b6fd35f229d6f4bdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 29 Dec 2023 10:17:56 +0800 Subject: [PATCH] master --- src/pages/atdTable/components/index.less | 8 +++----- src/pages/calcTable/calcFixedTotal.tsx | 2 +- src/pages/taxDeclareTable/index.tsx | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 12cae05..7cded41 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -86,7 +86,7 @@ .expand-th:hover { .toogle-lock-tool { - width: 37%; + display: flex; } } @@ -102,17 +102,15 @@ height: 100%; .title-text { - width: 90%; + flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - flex: 1 1; cursor: pointer; } .toogle-lock-tool { - display: flex; - width: 0; + display: none; overflow: hidden; height: 100%; justify-content: center; diff --git a/src/pages/calcTable/calcFixedTotal.tsx b/src/pages/calcTable/calcFixedTotal.tsx index f6c50a1..b23504b 100644 --- a/src/pages/calcTable/calcFixedTotal.tsx +++ b/src/pages/calcTable/calcFixedTotal.tsx @@ -49,7 +49,7 @@ const calcFixedTotal: FunctionComponent = (props) => { return (<> { _.map(columns, (item: any, index) => { - return + return { loading ? : {sumRow[item.dataIndex] || "-"} diff --git a/src/pages/taxDeclareTable/index.tsx b/src/pages/taxDeclareTable/index.tsx index 2223e9e..1e4cef7 100644 --- a/src/pages/taxDeclareTable/index.tsx +++ b/src/pages/taxDeclareTable/index.tsx @@ -40,6 +40,7 @@ const TaxDeclareTable: FC = (props) => { render: (_: any, record: any) => ( + {/**/} ) } @@ -49,6 +50,9 @@ const TaxDeclareTable: FC = (props) => { const handleEdit = (record: any) => { window.parent.postMessage({ type: "turn", payload: { id: "EDIT", params: { ...record } } }, "*"); }; + const handleDelete = (record: any) => { + window.parent.postMessage({ type: "turn", payload: { id: "DELETE", params: { ...record } } }, "*"); + }; const onChange = (current: number, pageSize: number) => { setPageInfo((prevState) => { const { pageSize: size } = prevState;