qt
/
salary-management-oneself
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/业务线管理

Browse Source 
# Conflicts:
#	src/pages/salaryFileTable/index.tsx
#	src/pages/welfareArchiveTable/index.tsx
release/2.19.1.2503.01-业务线个税
黎永顺 9 months ago
parent 3a5e06a6e7 61edeb5cfb
commit d82ca76290
9 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File

11
src/layouts/index.tsx
Unescape Escape View File

@ -13,6 +13,7 @@ import UserLayout from "./UserLayout";
import { IRouterProps, RouterContext } from "./RouterContext"; import { IRouterProps, RouterContext } from "./RouterContext";
import { layoutConfig } from "@/layouts/config"; import { layoutConfig } from "@/layouts/config";
import stores from "@/store"; import stores from "@/store";
import { Storage } from "@/utils";
import "moment/locale/zh-cn"; import "moment/locale/zh-cn";
import "antd/dist/antd.variable.min.css"; import "antd/dist/antd.variable.min.css";
@ -38,6 +39,16 @@ const Layout = ({ children, location, route, history, match }: IRouteComponentPr
useEffect(() => { useEffect(() => {
// API.SettingService.initSystemParam(); // 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; let layout;

24
src/pages/atdTable/components/index.less
Unescape Escape View File

@ -80,7 +80,7 @@
} }
.danger { .danger {
font-size: 12px; font-size: var(--data-size);
color: rgb(217, 0, 27) color: rgb(217, 0, 27)
} }
@ -140,11 +140,11 @@
align-items: center; align-items: center;
margin-right: 12px; margin-right: 12px;
color: #5d9cec; color: #5d9cec;
font-size: 12px; font-size: var(--data-size);
:global { :global {
.anticon { .anticon {
font-size: 12px; font-size: var(--data-size);
margin-right: 4px; margin-right: 4px;
} }
} }
@ -176,7 +176,7 @@
.ant-btn-link, .ant-dropdown-trigger { .ant-btn-link, .ant-dropdown-trigger {
padding: 0; padding: 0;
font-size: 12px; font-size: var(--data-size);
color: #333; color: #333;
} }
@ -199,7 +199,7 @@
.ant-spin-container { .ant-spin-container {
.ant-pagination { .ant-pagination {
font-size: 12px; font-size: var(--data-size);
align-items: center; align-items: center;
margin-right: 8px; margin-right: 8px;
@ -225,7 +225,7 @@
.ant-pagination-options { .ant-pagination-options {
.ant-select { .ant-select {
font-size: 12px; font-size: var(--data-size);
.ant-select-selector { .ant-select-selector {
height: 28px; height: 28px;
@ -242,7 +242,7 @@
} }
.ant-select-item { .ant-select-item {
font-size: 12px; font-size: var(--data-size);
} }
} }
@ -264,7 +264,7 @@
} }
th, td { th, td {
font-size: 12px; font-size: var(--data-size);
.ant-form-item { .ant-form-item {
margin-bottom: 0; margin-bottom: 0;
@ -277,7 +277,7 @@
.ant-typography { .ant-typography {
margin-bottom: 0 !important; margin-bottom: 0 !important;
font-size: 12px !important; font-size: var(--data-size) !important;
} }
.ant-checkbox-inner { .ant-checkbox-inner {
@ -307,7 +307,7 @@
.moreIconWrapper { .moreIconWrapper {
:global { :global {
.ant-btn-link { .ant-btn-link {
font-size: 12px; font-size: var(--data-size);
color: #333; color: #333;
} }
@ -321,7 +321,7 @@
.ant-dropdown-menu-title-content { .ant-dropdown-menu-title-content {
a { a {
font-size: 12px; font-size: var(--data-size);
color: #333; color: #333;
} }
@ -350,7 +350,7 @@
} }
.ant-dropdown-menu-item { .ant-dropdown-menu-item {
font-size: 12px; font-size: var(--data-size);
color: #333; color: #333;
} }

2
src/pages/calcTable/index.tsx
Unescape Escape View File

@ -48,7 +48,7 @@ const index: FunctionComponent<Props> = (props) => {
const data: any = exceptStr(event.data); const data: any = exceptStr(event.data);
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
const { const {
columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {},
showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail, showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail,
fixed = true, tableScrollHeight, sumRow, optWidth fixed = true, tableScrollHeight, sumRow, optWidth
} = data; } = data;

8
src/pages/custom-project/index.less
Unescape Escape View File

@ -14,7 +14,7 @@
.ant-spin-container { .ant-spin-container {
.ant-pagination { .ant-pagination {
font-size: 12px; font-size: var(--data-size);
align-items: center; align-items: center;
margin-right: 8px; margin-right: 8px;
@ -40,7 +40,7 @@
.ant-pagination-options { .ant-pagination-options {
.ant-select { .ant-select {
font-size: 12px; font-size: var(--data-size);
.ant-select-selector { .ant-select-selector {
height: 28px; height: 28px;
@ -57,7 +57,7 @@
} }
.ant-select-item { .ant-select-item {
font-size: 12px; font-size: var(--data-size);
} }
} }
@ -79,7 +79,7 @@
} }
th, td { th, td {
font-size: 12px; font-size: var(--data-size);
.ant-form-item { .ant-form-item {
margin-bottom: 0; margin-bottom: 0;

2
src/pages/passport/sign-in.less
Unescape Escape View File

@ -18,7 +18,7 @@
color: rgb(204, 204, 204); color: rgb(204, 204, 204);
text-align: center; text-align: center;
margin-top: 16px; margin-top: 16px;
font-size: 12px; font-size: var(--data-size);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }

2
src/pages/salaryFileTable/index.tsx
Unescape Escape View File

@ -38,7 +38,7 @@ const Index: FunctionComponent<Props> = (props) => {
const data: any = exceptStr(event.data); const data: any = exceptStr(event.data);
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
const { const {
columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, selectedKey, showDelSalaryFileBtn columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, selectedKey, showDelSalaryFileBtn
} = data; } = data;
setRunStatuses(selectedKey); setRunStatuses(selectedKey);
setI18n(i18nRes); setI18n(i18nRes);

12
src/pages/unitTable/index.less
Unescape Escape View File

@ -8,7 +8,7 @@
.ant-btn-link, .ant-dropdown-trigger { .ant-btn-link, .ant-dropdown-trigger {
padding: 0; padding: 0;
font-size: 12px; font-size: var(--data-size);
color: #333; color: #333;
} }
@ -31,7 +31,7 @@
.ant-spin-container { .ant-spin-container {
.ant-pagination { .ant-pagination {
font-size: 12px; font-size: var(--data-size);
align-items: center; align-items: center;
margin-right: 8px; margin-right: 8px;
@ -57,7 +57,7 @@
.ant-pagination-options { .ant-pagination-options {
.ant-select { .ant-select {
font-size: 12px; font-size: var(--data-size);
.ant-select-selector { .ant-select-selector {
height: 28px; height: 28px;
@ -74,7 +74,7 @@
} }
.ant-select-item { .ant-select-item {
font-size: 12px; font-size: var(--data-size);
} }
} }
@ -96,7 +96,7 @@
} }
th, td { th, td {
font-size: 12px; font-size: var(--data-size);
.ant-form-item { .ant-form-item {
margin-bottom: 0; margin-bottom: 0;
@ -117,7 +117,7 @@
} }
.ant-dropdown-menu-item { .ant-dropdown-menu-item {
font-size: 12px; font-size: var(--data-size);
color: #333; color: #333;
} }
} }

2
src/pages/unitTable/index.tsx
Unescape Escape View File

@ -36,7 +36,7 @@ const UnitTable: FC = (props) => {
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
const { const {
columns, dataSource, pageInfo, scrollHeight, i18n, showOperateBtn: permission, unitTableType = "welfareRecord", columns, dataSource, pageInfo, scrollHeight, i18n, showOperateBtn: permission, unitTableType = "welfareRecord",
selectedRowKeys: rowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {} selectedRowKeys: rowKeys = [], selectedKey, rowKey, showTotalCell = false, sumDataSource = {}
} = data; } = data;
setI18n(i18n); setI18n(i18n);
setColumns(columns); setColumns(columns);

2
src/pages/welfareArchiveTable/index.tsx
Unescape Escape View File

@ -37,7 +37,7 @@ const Index: FunctionComponent<Props> = (props) => {
const receiveMessageFromIndex = (event: any) => { const receiveMessageFromIndex = (event: any) => {
const data: any = exceptStr(event.data); const data: any = exceptStr(event.data);
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
const { columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, runStatuses } = data; const { columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, runStatuses } = data;
setRunStatuses(runStatuses); setRunStatuses(runStatuses);
setI18n(i18nRes); setI18n(i18nRes);
setPageInfo(pageInfo); setPageInfo(pageInfo);

Write Preview
Loading…
Cancel
Save