From 6e9bb76ff24c3855f2868fcdbc6bd9b8ed10b645 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, 27 Sep 2024 09:19:55 +0800 Subject: [PATCH 1/4] master --- src/pages/atdTable/components/index.less | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index c1fece5..e9c7323 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -279,6 +279,16 @@ margin-bottom: 0 !important; font-size: 12px !important; } + + .ant-checkbox-inner { + width: 14px; + height: 14px; + } + + .ant-checkbox-inner:after { + width: 5px; + height: 8px; + } } } From 236f99b8b5869e046b41eab5b0b9bc0fe31502b2 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, 30 Sep 2024 10:21:03 +0800 Subject: [PATCH 2/4] master --- src/pages/atdTable/components/index.less | 12 ++++++++++++ src/pages/calcTable/index.tsx | 15 ++++++--------- src/pages/salaryFileTable/index.tsx | 17 +++++++---------- src/pages/unitTable/index.tsx | 11 +++++++---- src/pages/welfareArchiveTable/index.tsx | 18 ++++++++---------- 5 files changed, 40 insertions(+), 33 deletions(-) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index e9c7323..3c0cd6c 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -285,6 +285,18 @@ height: 14px; } + .ant-table-header { + .ant-checkbox-checked { + .ant-checkbox-inner:after { + width: 5px !important; + } + } + + .ant-checkbox-inner:after { + width: 8px !important; + } + } + .ant-checkbox-inner:after { width: 5px; height: 8px; diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 7d2db9c..61edc4d 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, i18n: i18nRes = {}, + columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail, fixed = true, tableScrollHeight, sumRow, optWidth } = data; @@ -61,7 +61,7 @@ const index: FunctionComponent = (props) => { setSumRow(sumRow); setPageInfo(pageInfo); setDataSource(dataSource); - setSelectedRowKeys(selectedRowKeys); + setSelectedRowKeys([...selectedRowKeys, ...rowKeys]); setTableScrollHeight(tableScrollHeight); setColumns([...convertColumns(_.map(columns, o => ({ ...o, i18n: i18nRes }))), { title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: optWidth || 120, @@ -142,14 +142,11 @@ const index: FunctionComponent = (props) => { columnWidth: 60, columnTitle: (isDetailTable && !showTotalCell) ? "序号" : "", renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => ((isDetailTable && !showTotalCell) ? {index + 1} : originNode), - selectedRowKeys: selectedRowKeys, - onChange: (selectedRowKeys: React.Key[]) => { - setSelectedRowKeys(selectedRowKeys); + selectedRowKeys, preserveSelectedRowKeys: true, + onChange: (rowKeys: React.Key[]) => { + setSelectedRowKeys(rowKeys); window.parent.postMessage( - { - type: "turn", - payload: { id: "CHECKBOX", params: { selectedRowKeys } } - }, + { type: "turn", payload: { id: "CHECKBOX", params: { selectedRowKeys: rowKeys } } }, "*" ); } diff --git a/src/pages/salaryFileTable/index.tsx b/src/pages/salaryFileTable/index.tsx index 6185926..ef31bb3 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, i18n: i18nRes = {}, + columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, selectedKey, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission } = data; setShowOperateBtn(showOperateBtn); @@ -48,7 +48,7 @@ const Index: FunctionComponent = (props) => { setI18n(i18nRes); setPageInfo(pageInfo); setDataSource(dataSource); - setSelectedRowKeys(selectedRowKeys); + setSelectedRowKeys([...rowKeys, ...selectedRowKeys]); setColumns(columns); setShowDelSalaryFileBtn(showDelSalaryFileBtn); setDCChiefPermission(DCChiefPermission); @@ -68,15 +68,12 @@ const Index: FunctionComponent = (props) => { }); }; const rowSelection = { - columnWidth: 60, - selectedRowKeys: selectedRowKeys, - onChange: (selectedRowKeys: React.Key[]) => { - setSelectedRowKeys(selectedRowKeys); + columnWidth: 60, selectedRowKeys, + preserveSelectedRowKeys: true, + onChange: (rowKeys: React.Key[]) => { + setSelectedRowKeys(rowKeys); window.parent.postMessage( - { - type: "turn", - payload: { id: "ROWSELECTION", params: { selectedRowKeys } } - }, + { type: "turn", payload: { id: "ROWSELECTION", params: { selectedRowKeys: rowKeys } } }, "*" ); } diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx index f40d7df..8287327 100644 --- a/src/pages/unitTable/index.tsx +++ b/src/pages/unitTable/index.tsx @@ -36,7 +36,7 @@ const UnitTable: FC = (props) => { if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, scrollHeight, i18n, showOperateBtn: permission, unitTableType = "welfareRecord", - selectedRowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {} + selectedRowKeys: rowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {} } = data; setI18n(i18n); setColumns(columns); @@ -44,7 +44,10 @@ const UnitTable: FC = (props) => { setPageInfo(pageInfo); setUnitTableType(unitTableType); setSumRow(sumDataSource); - setExtraParams({ selectedKey, selectedRowKeys, scrollHeight, permission, rowKey, showTotalCell }); + setExtraParams({ + selectedKey, scrollHeight, permission, rowKey, showTotalCell, + selectedRowKeys: [extraParams.selectedRowKeys, ...rowKeys] + }); } }; const onChange = (current: number, pageSize: number) => { @@ -61,8 +64,8 @@ const UnitTable: FC = (props) => { }); }; const rowSelection = { - columnWidth: 60, - selectedRowKeys: extraParams.selectedRowKeys, + columnWidth: 60, selectedRowKeys: extraParams.selectedRowKeys, + preserveSelectedRowKeys: true, onChange: (selectedRowKeys: React.Key[]) => { // @ts-ignore setExtraParams({ ...extraParams, selectedRowKeys: selectedRowKeys }); diff --git a/src/pages/welfareArchiveTable/index.tsx b/src/pages/welfareArchiveTable/index.tsx index d969b13..fcedda8 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, i18n: i18nRes = {}, + columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, runStatuses, showOperateBtn } = data; setShowOperateBtn(showOperateBtn); @@ -47,7 +47,7 @@ const Index: FunctionComponent = (props) => { setI18n(i18nRes); setPageInfo(pageInfo); setDataSource(dataSource); - setSelectedRowKeys(selectedRowKeys); + setSelectedRowKeys([...rowKeys, ...selectedRowKeys]); setColumns(columns); } }; @@ -64,16 +64,14 @@ const Index: FunctionComponent = (props) => { return { ...pageInfo, current: size === pageSize ? current : 1, pageSize }; }); }; + const rowSelection = { - columnWidth: 60, - selectedRowKeys: selectedRowKeys, - onChange: (selectedRowKeys: React.Key[]) => { - setSelectedRowKeys(selectedRowKeys); + columnWidth: 60, selectedRowKeys, + preserveSelectedRowKeys: true, + onChange: (rowKeys: React.Key[]) => { + setSelectedRowKeys(rowKeys); window.parent.postMessage( - { - type: "turn", - payload: { id: "CHECKBOX", params: { selectedRowKeys } } - }, + { type: "turn", payload: { id: "CHECKBOX", params: { selectedRowKeys: rowKeys } } }, "*" ); } From 38512656c387c10b30e2ab688014d0bcf557b6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 9 Oct 2024 11:07:45 +0800 Subject: [PATCH 3/4] master --- src/layouts/index.tsx | 11 +++++++++++ src/pages/atdTable/components/index.less | 24 ++++++++++++------------ src/pages/custom-project/index.less | 8 ++++---- src/pages/passport/sign-in.less | 2 +- src/pages/unitTable/index.less | 12 ++++++------ 5 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 9369776..8b5dc47 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -13,6 +13,7 @@ import UserLayout from "./UserLayout"; import { IRouterProps, RouterContext } from "./RouterContext"; import { layoutConfig } from "@/layouts/config"; import stores from "@/store"; +import { Storage } from "@/utils"; import "moment/locale/zh-cn"; import "antd/dist/antd.variable.min.css"; @@ -38,6 +39,16 @@ const Layout = ({ children, location, route, history, match }: IRouteComponentPr useEffect(() => { // API.SettingService.initSystemParam(); + const { themeFontSize } = Storage.local.get("theme-themeInfo") || { themeFontSize: "12" }; + document.documentElement.style.setProperty("--data-size", themeFontSize + "px"); + const checkData = () => { + const { themeFontSize } = Storage.local.get("theme-themeInfo") || { themeFontSize: "12" }; + document.documentElement.style.setProperty("--data-size", themeFontSize + "px"); + }; + window.addEventListener("storage", checkData); + return () => { + window.removeEventListener("storage", checkData); + }; }, []); let layout; diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 3c0cd6c..bed55a6 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -80,7 +80,7 @@ } .danger { - font-size: 12px; + font-size: var(--data-size); color: rgb(217, 0, 27) } @@ -140,11 +140,11 @@ align-items: center; margin-right: 12px; color: #5d9cec; - font-size: 12px; + font-size: var(--data-size); :global { .anticon { - font-size: 12px; + font-size: var(--data-size); margin-right: 4px; } } @@ -176,7 +176,7 @@ .ant-btn-link, .ant-dropdown-trigger { padding: 0; - font-size: 12px; + font-size: var(--data-size); color: #333; } @@ -199,7 +199,7 @@ .ant-spin-container { .ant-pagination { - font-size: 12px; + font-size: var(--data-size); align-items: center; margin-right: 8px; @@ -225,7 +225,7 @@ .ant-pagination-options { .ant-select { - font-size: 12px; + font-size: var(--data-size); .ant-select-selector { height: 28px; @@ -242,7 +242,7 @@ } .ant-select-item { - font-size: 12px; + font-size: var(--data-size); } } @@ -264,7 +264,7 @@ } th, td { - font-size: 12px; + font-size: var(--data-size); .ant-form-item { margin-bottom: 0; @@ -277,7 +277,7 @@ .ant-typography { margin-bottom: 0 !important; - font-size: 12px !important; + font-size: var(--data-size) !important; } .ant-checkbox-inner { @@ -307,7 +307,7 @@ .moreIconWrapper { :global { .ant-btn-link { - font-size: 12px; + font-size: var(--data-size); color: #333; } @@ -321,7 +321,7 @@ .ant-dropdown-menu-title-content { a { - font-size: 12px; + font-size: var(--data-size); color: #333; } @@ -350,7 +350,7 @@ } .ant-dropdown-menu-item { - font-size: 12px; + font-size: var(--data-size); color: #333; } diff --git a/src/pages/custom-project/index.less b/src/pages/custom-project/index.less index 0a71435..781b0c0 100644 --- a/src/pages/custom-project/index.less +++ b/src/pages/custom-project/index.less @@ -14,7 +14,7 @@ .ant-spin-container { .ant-pagination { - font-size: 12px; + font-size: var(--data-size); align-items: center; margin-right: 8px; @@ -40,7 +40,7 @@ .ant-pagination-options { .ant-select { - font-size: 12px; + font-size: var(--data-size); .ant-select-selector { height: 28px; @@ -57,7 +57,7 @@ } .ant-select-item { - font-size: 12px; + font-size: var(--data-size); } } @@ -79,7 +79,7 @@ } th, td { - font-size: 12px; + font-size: var(--data-size); .ant-form-item { margin-bottom: 0; diff --git a/src/pages/passport/sign-in.less b/src/pages/passport/sign-in.less index 8db0736..9a45033 100644 --- a/src/pages/passport/sign-in.less +++ b/src/pages/passport/sign-in.less @@ -18,7 +18,7 @@ color: rgb(204, 204, 204); text-align: center; margin-top: 16px; - font-size: 12px; + font-size: var(--data-size); display: flex; justify-content: space-between; } diff --git a/src/pages/unitTable/index.less b/src/pages/unitTable/index.less index 40485fe..852cac3 100644 --- a/src/pages/unitTable/index.less +++ b/src/pages/unitTable/index.less @@ -8,7 +8,7 @@ .ant-btn-link, .ant-dropdown-trigger { padding: 0; - font-size: 12px; + font-size: var(--data-size); color: #333; } @@ -31,7 +31,7 @@ .ant-spin-container { .ant-pagination { - font-size: 12px; + font-size: var(--data-size); align-items: center; margin-right: 8px; @@ -57,7 +57,7 @@ .ant-pagination-options { .ant-select { - font-size: 12px; + font-size: var(--data-size); .ant-select-selector { height: 28px; @@ -74,7 +74,7 @@ } .ant-select-item { - font-size: 12px; + font-size: var(--data-size); } } @@ -96,7 +96,7 @@ } th, td { - font-size: 12px; + font-size: var(--data-size); .ant-form-item { margin-bottom: 0; @@ -117,7 +117,7 @@ } .ant-dropdown-menu-item { - font-size: 12px; + font-size: var(--data-size); color: #333; } } From 5bf5a45a490d821651ad00ca0bd085617c9c8b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 9 Oct 2024 11:28:54 +0800 Subject: [PATCH 4/4] master --- src/pages/unitTable/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx index 8287327..a921749 100644 --- a/src/pages/unitTable/index.tsx +++ b/src/pages/unitTable/index.tsx @@ -36,7 +36,7 @@ const UnitTable: FC = (props) => { if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, scrollHeight, i18n, showOperateBtn: permission, unitTableType = "welfareRecord", - selectedRowKeys: rowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {} + selectedRowKeys: rowKeys = [], selectedKey, rowKey, showTotalCell = false, sumDataSource = {} } = data; setI18n(i18n); setColumns(columns);