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

Merge branch 'master' into feature/核算表格双击编辑 

# 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
This commit is contained in:
lys 2025-09-16 14:58:27 +08:00
parent 7174baa119 4ac19f78fd
commit 7d97bf043c
9 changed files with 117 additions and 9 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">&#xe78c;</span>
<div class="name">标记-copy</div>
<div class="code-name">&amp;#xe78c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe604;</span>
<div class="name">标记</div>
<div class="code-name">&amp;#xe604;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe710;</span>
<div class="name">取消标记</div>
<div class="code-name">&amp;#xe710;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6f0;</span>
<div class="name">双击</div>
@ -210,9 +228,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1742897212506') format('woff2'),
url('iconfont.woff?t=1742897212506') format('woff'),
url('iconfont.ttf?t=1742897212506') format('truetype');
src: url('iconfont.woff2?t=1750298885691') format('woff2'),
url('iconfont.woff?t=1750298885691') format('woff'),
url('iconfont.ttf?t=1750298885691') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -238,6 +256,33 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-biaoji-copy"></span>
<div class="name">
标记-copy
</div>
<div class="code-name">.icon-biaoji-copy
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-biaoji"></span>
<div class="name">
标记
</div>
<div class="code-name">.icon-biaoji
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-quxiaobiaoji"></span>
<div class="name">
取消标记
</div>
<div class="code-name">.icon-quxiaobiaoji
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shuangji"></span>
<div class="name">
@ -472,6 +517,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-biaoji-copy"></use>
</svg>
<div class="name">标记-copy</div>
<div class="code-name">#icon-biaoji-copy</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-biaoji"></use>
</svg>
<div class="name">标记</div>
<div class="code-name">#icon-biaoji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-quxiaobiaoji"></use>
</svg>
<div class="name">取消标记</div>
<div class="code-name">#icon-quxiaobiaoji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shuangji"></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=1742897212506') format('woff2'),
url('iconfont.woff?t=1742897212506') format('woff'),
url('iconfont.ttf?t=1742897212506') format('truetype');
src: url('iconfont.woff2?t=1750298885691') format('woff2'),
url('iconfont.woff?t=1750298885691') format('woff'),
url('iconfont.ttf?t=1750298885691') format('truetype');
}
.iconfont {
@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-biaoji-copy:before {
content: "\e78c";
}
.icon-biaoji:before {
content: "\e604";
}
.icon-quxiaobiaoji:before {
content: "\e710";
}
.icon-shuangji:before {
content: "\e6f0";
}

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": "44653522",
"name": "标记-copy",
"font_class": "biaoji-copy",
"unicode": "e78c",
"unicode_decimal": 59276
},
{
"icon_id": "14559255",
"name": "标记",
"font_class": "biaoji",
"unicode": "e604",
"unicode_decimal": 58884
},
{
"icon_id": "33872224",
"name": "取消标记",
"font_class": "quxiaobiaoji",
"unicode": "e710",
"unicode_decimal": 59152
},
{
"icon_id": "39084114",
"name": "双击",

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/index.tsx
View File

@ -184,7 +184,7 @@ const Index: FunctionComponent<Props> = (props) => {
return (
<Dropdown menu={{ items: !item.calcDetail || item.rightClickType ? items : [] }} trigger={["contextMenu"]} overlayClassName={styles.contextMenu} destroyPopupOnHide>
<span className={styles.contentSpan}>
<span title={text} className={styles.contentTitle} style={{ color: `${record?.[item.dataIndex + "_color"]}` }}>
<span title={text} className={styles.contentTitle} style={record?.[item.dataIndex + "_color"] ? { color: `${record?.[item.dataIndex + "_color"]}` } : {}}>
{text}
</span>
{record.lockItems && record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}

8
src/pages/unitTable/renderColsOpts.tsx
View File

@ -46,7 +46,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
};
break;
case "paymentOrganization":
col = { ...col, width: 200 };
col = { ...col, width: g.width || 200 };
break;
case "socialNum":
case "otherNum":
@ -494,6 +494,12 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
return col;
})
];
} else if (type === "cusTitle") {
return [
..._.map(initialState, (g) => {
return { ...g, title: <span dangerouslySetInnerHTML={{ __html: g.title }} /> };
})
];
}
return initialState;
}, [initialState, type, i18n, extraParams]);