From 61edeb5cfbeedf983b0dfd71f290bbbeb174330a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 10 Oct 2024 10:13:51 +0800 Subject: [PATCH 1/3] master --- src/pages/calcTable/index.tsx | 2 +- src/pages/salaryFileTable/index.tsx | 2 +- src/pages/welfareArchiveTable/index.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 61edc4d..7aedce1 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -48,7 +48,7 @@ const index: FunctionComponent = (props) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { const { - columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, + columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail, fixed = true, tableScrollHeight, sumRow, optWidth } = data; diff --git a/src/pages/salaryFileTable/index.tsx b/src/pages/salaryFileTable/index.tsx index ef31bb3..1a5830d 100644 --- a/src/pages/salaryFileTable/index.tsx +++ b/src/pages/salaryFileTable/index.tsx @@ -40,7 +40,7 @@ const Index: FunctionComponent = (props) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { const { - columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, + columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, selectedKey, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission } = data; setShowOperateBtn(showOperateBtn); diff --git a/src/pages/welfareArchiveTable/index.tsx b/src/pages/welfareArchiveTable/index.tsx index fcedda8..7fb50e1 100644 --- a/src/pages/welfareArchiveTable/index.tsx +++ b/src/pages/welfareArchiveTable/index.tsx @@ -39,7 +39,7 @@ const Index: FunctionComponent = (props) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { const { - columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, + columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, runStatuses, showOperateBtn } = data; setShowOperateBtn(showOperateBtn); From 8c95f9b37d2d14e2fc514672a8fb350052adef4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 14 Oct 2024 13:32:16 +0800 Subject: [PATCH 2/3] master --- src/pages/unitTable/renderColsOpts.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index 479563f..f1638e9 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -304,7 +304,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, return ( + onClick={() => postMessageToParent("EDIT", record)}>{i18n?.["编辑"]} From 60b325a1995c0dc02ffb47f6692de0f1102c854b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 14 Oct 2024 14:16:49 +0800 Subject: [PATCH 3/3] master --- src/pages/unitTable/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx index a921749..4e5039b 100644 --- a/src/pages/unitTable/index.tsx +++ b/src/pages/unitTable/index.tsx @@ -22,7 +22,7 @@ const UnitTable: FC = (props) => { const [pageInfo, setPageInfo] = useState>({}); const [sumRow, setSumRow] = useState>({});//总计行数据 const [i18n, setI18n] = useState({}); - const [extraParams, setExtraParams] = useState>({});//额外参数 + const [extraParams, setExtraParams] = useState>({ selectedRowKeys: [] });//额外参数 useEffect(() => { window.parent.postMessage({ type: "init" }, "*"); @@ -46,7 +46,7 @@ const UnitTable: FC = (props) => { setSumRow(sumDataSource); setExtraParams({ selectedKey, scrollHeight, permission, rowKey, showTotalCell, - selectedRowKeys: [extraParams.selectedRowKeys, ...rowKeys] + selectedRowKeys: [...extraParams.selectedRowKeys as string[] | number[], ...rowKeys] }); } };