Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图

# Conflicts:
#	public/css/iconfont/demo_index.html
#	public/css/iconfont/iconfont.css
#	public/css/iconfont/iconfont.js
#	public/css/iconfont/iconfont.json
#	public/css/iconfont/iconfont.ttf
#	public/css/iconfont/iconfont.woff
#	public/css/iconfont/iconfont.woff2
release/2.19.1.2503.01-业务线个税
黎永顺 2 years ago
commit 4c3c2999be

@ -38,7 +38,7 @@
<div class="main">
<h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
<img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
</a></h1>
<div class="nav-tabs">
<ul id="tabs" class="dib-box">
@ -46,50 +46,50 @@
<li class="dib"><span>Font class</span></li>
<li class="dib"><span>Symbol</span></li>
</ul>
<a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4257468" target="_blank" class="nav-more">查看项目</a>
</div>
<div class="tab-container">
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe619;</span>
<div class="name">批量分配</div>
<div class="code-name">&amp;#xe619;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe724;</span>
<div class="name">操作日志</div>
<div class="code-name">&amp;#xe724;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6aa;</span>
<div class="name">警告</div>
<div class="code-name">&amp;#xe6aa;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe70c;</span>
<div class="name">应急处理</div>
<div class="code-name">&amp;#xe70c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe652;</span>
<div class="name">批量解锁</div>
<div class="code-name">&amp;#xe652;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe653;</span>
<div class="name">批量锁定</div>
<div class="code-name">&amp;#xe653;</div>
</li>
</ul>
<div class="article markdown">
<h2 id="unicode-">Unicode 引用</h2>
@ -135,7 +135,7 @@
</div>
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-piliangfenpei"></span>
<div class="name">
@ -144,7 +144,7 @@
<div class="code-name">.icon-piliangfenpei
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-caozuorizhi32"></span>
<div class="name">
@ -153,7 +153,7 @@
<div class="code-name">.icon-caozuorizhi32
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-jinggao"></span>
<div class="name">
@ -162,7 +162,7 @@
<div class="code-name">.icon-jinggao
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-yingjichuli"></span>
<div class="name">
@ -171,7 +171,7 @@
<div class="code-name">.icon-yingjichuli
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-piliangjiesuo"></span>
<div class="name">
@ -180,7 +180,7 @@
<div class="code-name">.icon-piliangjiesuo
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-piliangsuoding"></span>
<div class="name">
@ -189,7 +189,7 @@
<div class="code-name">.icon-piliangsuoding
</div>
</li>
</ul>
<div class="article markdown">
<h2 id="font-class-">font-class 引用</h2>
@ -216,7 +216,7 @@
</div>
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-piliangfenpei"></use>
@ -224,7 +224,7 @@
<div class="name">批量分配</div>
<div class="code-name">#icon-piliangfenpei</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-caozuorizhi32"></use>
@ -232,7 +232,7 @@
<div class="name">操作日志</div>
<div class="code-name">#icon-caozuorizhi32</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jinggao"></use>
@ -240,7 +240,7 @@
<div class="name">警告</div>
<div class="code-name">#icon-jinggao</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yingjichuli"></use>
@ -248,7 +248,7 @@
<div class="name">应急处理</div>
<div class="code-name">#icon-yingjichuli</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-piliangjiesuo"></use>
@ -256,7 +256,7 @@
<div class="name">批量解锁</div>
<div class="code-name">#icon-piliangjiesuo</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-piliangsuoding"></use>
@ -264,7 +264,7 @@
<div class="name">批量锁定</div>
<div class="code-name">#icon-piliangsuoding</div>
</li>
</ul>
<div class="article markdown">
<h2 id="symbol-">Symbol 引用</h2>

File diff suppressed because one or more lines are too long

@ -23,8 +23,9 @@ export default ({ children, style = {} }: any) => {
window.location.hash.indexOf("atdTable") !== -1 ||
window.location.hash.indexOf("standingbookTable") !== -1 ||
window.location.hash.indexOf("previewTable") !== -1 ||
window.location.hash.indexOf("calcTable") !== -1
) ? "#f6f6f6" : "#FFF",
window.location.hash.indexOf("calcTable") !== -1 ||
window.location.hash.indexOf("welfareArchiveTable") !== -1
) ? "rgb(241,241,241)" : "#FFF",
...style
}}
>

@ -18,6 +18,7 @@ module.exports = {
"/welfareLedgerTable.*": "blank",
"/payrollFilesTable.*": "blank",
"/employeeDeclareTable.*": "blank",
"/welfareArchiveTable.*": "blank",
"/manage.*": "manage",
"/portal.*": "template",
"/passport/oauth-in": "blank",

@ -159,6 +159,10 @@
}
:global {
.ant-btn-link {
height: inherit !important;
}
.ant-btn-link, .ant-dropdown-trigger {
padding: 0;
font-size: 12px;
@ -293,6 +297,17 @@
}
:global {
.ant-dropdown-placement-bottomRight {
.ant-dropdown-menu {
max-height: inherit !important;
}
}
.ant-dropdown-menu-item {
font-size: 12px;
color: #333;
}
.rankMapWrapper {
.ant-table-thead > tr > th {
background: #ED7D31;

@ -63,7 +63,7 @@ const ReportTable: FC = (props) => {
if (!showSumrow) return;
let totalColumns: any[] = [];
_.forEach(columns, it => {
if (!it.children) {
if (_.isEmpty(it.children)) {
totalColumns.push(it);
} else {
totalColumns = [...totalColumns, ...it.children];
@ -73,11 +73,7 @@ const ReportTable: FC = (props) => {
<Table.Summary fixed>
<Table.Summary.Row>
{
_.map([{}, ...totalColumns], (item, index) => {
if (index === 0) {
return <Table.Summary.Cell index={0} key={index} align="center"><Text
type="danger"></Text></Table.Summary.Cell>;
}
_.map(totalColumns, (item, index) => {
return <Table.Summary.Cell index={index} key={index} align="center">
<Text type="danger">{!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"}</Text>
</Table.Summary.Cell>;

@ -0,0 +1,191 @@
/*
* Author:
* name:
* Description:
* Date: 2023/11/1
*/
import React, { FunctionComponent, useEffect, useMemo, useState } from "react";
import { ColumnType } from "antd/lib/table";
import { PaginationData } from "rc-pagination";
import styles from "@/pages/atdTable/components/index.less";
import { exceptStr, paginationAction } from "@/utils/common";
import type { MenuProps } from "antd";
import { Button, Dropdown, Space, Table } from "antd";
import { MoreOutlined } from "@ant-design/icons";
interface OwnProps {
}
type Props = OwnProps;
const Index: FunctionComponent<Props> = (props) => {
const [columns, setColumns] = useState<ColumnType<any>[]>([]);
const [dataSource, setDataSource] = useState<any[]>([]);
const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({});
const [i18n, setI18n] = useState<any>({});
const [runStatuses, setRunStatuses] = useState<string>("");
const [showOperateBtn, setShowOperateBtn] = useState<boolean>(false);
useEffect(() => {
window.parent.postMessage({ type: "init" }, "*");
window.addEventListener("message", receiveMessageFromIndex, false);
return () => {
window.removeEventListener("message", receiveMessageFromIndex, false);
};
}, []);
const receiveMessageFromIndex = (event: any) => {
const data: any = exceptStr(event.data);
if (!_.isEmpty(data)) {
const {
columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {},
runStatuses, showOperateBtn
} = data;
setShowOperateBtn(showOperateBtn);
setRunStatuses(runStatuses);
setI18n(i18nRes);
setPageInfo(pageInfo);
setDataSource(dataSource);
setSelectedRowKeys(selectedRowKeys);
setColumns(columns);
}
};
const onChange = (current: number, pageSize: number) => {
setPageInfo((prevState) => {
const { pageSize: size } = prevState;
window.parent.postMessage(
{
type: "turn",
payload: { id: "PAGEINFO", params: { ...pageInfo, current: size === pageSize ? current : 1, pageSize } }
},
"*"
);
return { ...pageInfo, current: size === pageSize ? current : 1, pageSize };
});
};
const rowSelection = {
columnWidth: 60,
selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: React.Key[]) => {
setSelectedRowKeys(selectedRowKeys);
window.parent.postMessage(
{
type: "turn",
payload: { id: "CHECKBOX", params: { selectedRowKeys } }
},
"*"
);
}
};
const handleWelfareOperate = (type: string, record: any, interfaceParams?: any) => {
window.parent.postMessage(
{
type: "turn",
payload: { id: type, params: { record, interfaceParams } }
},
"*"
);
};
const cols: any = useMemo(() => {
let opts: any = { title: i18n["操作"], dataIndex: "operate", fixed: "right", width: 185 };
switch (runStatuses) {
case "1":
opts = {
...opts,
render: (__: any, record: any) => {
const items: MenuProps["items"] = [
{
key: "DeleteFiles",
label: i18n["删除档案"],
onClick: () => handleWelfareOperate("DEL-ARCHIVE", record)
},
{
key: "DeleteTodoList",
label: i18n["删除待办"],
onClick: () => handleWelfareOperate("DEL-TO-DO", record, { runStatus: "4" })
}
];
return (<Space>
<Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Button type="link" onClick={() => handleWelfareOperate("ADD-TO-PAY", record)}>{i18n["增员"]}</Button>
<Dropdown menu={{ items }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>);
}
};
break;
case "2,3":
case "ext":
opts = {
...opts,
render: (__: any, record: any) => (
<Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>)
};
break;
case "3":
opts = {
...opts,
render: (__: any, record: any) => {
const downsizingItems: MenuProps["items"] = [
{
key: "DeleteTodoList",
label: i18n["删除待办"],
onClick: () => handleWelfareOperate("DEL-TO-DO-STAY", record, { runStatus: "3" })
}
];
return (<Space>
<Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Button type="link"
onClick={() => handleWelfareOperate("STAY-DEL-TO-STOP", record)}>{i18n["减员"]}</Button>
<Dropdown menu={{ items: downsizingItems }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>);
}
};
break;
case "4,5":
opts = {
...opts,
render: (__: any, record: any) => {
const stopItems: MenuProps["items"] = [
{
key: "CancelSuspension",
label: i18n["取消停缴"],
onClick: () => handleWelfareOperate("CANCEL-STOP", record)
}
];
return (<Space>
<Button type="link" onClick={() => handleWelfareOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Button type="link"
onClick={() => handleWelfareOperate("DEL-ARCHIVE", record)}>{i18n["删除档案"]}</Button>
<Dropdown menu={{ items: stopItems }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>);
}
};
break;
default:
break;
}
return showOperateBtn ? [...columns, opts] : [...columns, {
...opts,
render: (__: any, record: any) => (
<Button type="link" onClick={() => handleWelfareOperate("VIEW", record)}>{i18n["查看"]}</Button>)
}];
}, [columns, runStatuses, i18n, showOperateBtn]);
return (<Table
rowKey="baseInfo" size="small" className={styles.tableWrapper}
columns={cols} dataSource={dataSource} rowSelection={rowSelection}
scroll={{ x: 1200, y: `calc(100vh - 103px)` }}
pagination={{
...paginationAction(pageInfo, i18n, onChange),
size: "default"
}}
/>);
};
export default Index;

@ -72,14 +72,21 @@ export const exceptStr = (str) => {
export const paginationFun = (tableListPageObj, sizeChange, onChange, i18n = {}) => {
return {
current: tableListPageObj.pageNum,
pageSize: tableListPageObj.size,
current: tableListPageObj.pageNum || tableListPageObj.current,
pageSize: tableListPageObj.size || tableListPageObj.pageSize,
total: tableListPageObj.total,
showTotal: total => `${i18n["共"] ? i18n["共"] : "共"} ${total} ${i18n["条"] ? i18n["条"] : "条"}`,
showQuickJumper: true,
showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],
onShowSizeChange: () => sizeChange(),
onShowSizeChange: (page, size) => {
const { total } = tableListPageObj;
sizeChange({
pageNum: page,
size,
total
});
},
onChange: (page, size) => {
const { total } = tableListPageObj;
onChange({
@ -90,3 +97,16 @@ export const paginationFun = (tableListPageObj, sizeChange, onChange, i18n = {})
}
};
};
export const paginationAction = (pageInfo = {}, i18n = {}, onChange, onShowSizeChange) => {
return {
pageSize: pageInfo.pageSize || 10,
current: pageInfo.current || 1,
total: pageInfo.total || 0,
pageSizeOptions: ["10", "20", "50", "100"],
showTotal: total => `${i18n["共"] ? i18n["共"] : "共"} ${total} ${i18n["条"] ? i18n["条"] : "条"}`,
onChange, onShowSizeChange,
showQuickJumper: true,
showSizeChanger: true
};
};

Loading…
Cancel
Save