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

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

This commit is contained in:
lys 2025-03-14 15:38:13 +08:00
parent f0f5e8ab36 ed8f9a056b
commit 1dd9bc997b
9 changed files with 113 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
public/css/iconfont/demo_index.html
View File

@ -54,6 +54,24 @@
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe61e;</span>
<div class="name">export</div>
<div class="code-name">&amp;#xe61e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe617;</span>
<div class="name">对比</div>
<div class="code-name">&amp;#xe617;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe73a;</span>
<div class="name">import</div>
<div class="code-name">&amp;#xe73a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c6;</span>
<div class="name">error</div>
@ -186,9 +204,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1723796605504') format('woff2'),
url('iconfont.woff?t=1723796605504') format('woff'),
url('iconfont.ttf?t=1723796605504') format('truetype');
src: url('iconfont.woff2?t=1741245710478') format('woff2'),
url('iconfont.woff?t=1741245710478') format('woff'),
url('iconfont.ttf?t=1741245710478') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -214,6 +232,33 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-export"></span>
<div class="name">
export
</div>
<div class="code-name">.icon-export
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-duibi"></span>
<div class="name">
对比
</div>
<div class="code-name">.icon-duibi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-import"></span>
<div class="name">
import
</div>
<div class="code-name">.icon-import
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-error"></span>
<div class="name">
@ -412,6 +457,30 @@
<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-export"></use>
</svg>
<div class="name">export</div>
<div class="code-name">#icon-export</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-duibi"></use>
</svg>
<div class="name">对比</div>
<div class="code-name">#icon-duibi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-import"></use>
</svg>
<div class="name">import</div>
<div class="code-name">#icon-import</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-error"></use>

18
public/css/iconfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4257468 */
src: url('iconfont.woff2?t=1723796605504') format('woff2'),
url('iconfont.woff?t=1723796605504') format('woff'),
url('iconfont.ttf?t=1723796605504') format('truetype');
src: url('iconfont.woff2?t=1741245710478') format('woff2'),
url('iconfont.woff?t=1741245710478') format('woff'),
url('iconfont.ttf?t=1741245710478') format('truetype');
}
.iconfont {
@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-export:before {
content: "\e61e";
}
.icon-duibi:before {
content: "\e617";
}
.icon-import:before {
content: "\e73a";
}
.icon-error:before {
content: "\e6c6";
}

2
public/css/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

21
public/css/iconfont/iconfont.json
View File

@ -5,6 +5,27 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "10124054",
"name": "export",
"font_class": "export",
"unicode": "e61e",
"unicode_decimal": 58910
},
{
"icon_id": "18272183",
"name": "对比",
"font_class": "duibi",
"unicode": "e617",
"unicode_decimal": 58903
},
{
"icon_id": "19300598",
"name": "import",
"font_class": "import",
"unicode": "e73a",
"unicode_decimal": 59194
},
{
"icon_id": "6652504",
"name": "error",

BIN
public/css/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
public/css/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
public/css/iconfont/iconfont.woff2
View File

Binary file not shown.

2
src/pages/calcTable/calcFixedTotal.tsx
View File

@ -61,7 +61,7 @@ const calcFixedTotal: FunctionComponent<Props> = (props) => {
return <Table.Summary.Cell index={index + 1} key={index + 1} align={_.head(columns)?.align || "left"}>
{
loading ? <Spin spinning={loading} size="small"></Spin> :
<Text type="danger">{!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"}</Text>
<Text type="danger">{(sumRow && !_.isNil(sumRow[item.dataIndex])) ? sumRow[item.dataIndex] : "-"}</Text>
}
</Table.Summary.Cell>;
})

6
src/pages/calcTable/index.tsx
View File

@ -244,9 +244,9 @@ const index: FunctionComponent<Props> = (props) => {
});
};
const rowSelection = {
columnWidth: 60,
columnTitle: isDetailTable && !showTotalCell ? "序号" : "",
renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable && !showTotalCell ? <span>{index + 1}</span> : originNode),
columnWidth: 50,
columnTitle: isDetailTable ? "序号" : "",
renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ? <span>{index + 1}</span> : originNode),
selectedRowKeys,
preserveSelectedRowKeys: true,
onChange: (rowKeys: React.Key[]) => {