From eb126006a1f82443bb02ba2f8176a286166b0575 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 19 Jun 2025 09:19:30 +0800 Subject: [PATCH 1/6] master --- public/css/iconfont/demo_index.html | 75 ++++++++++++++++++++++++++-- public/css/iconfont/iconfont.css | 18 +++++-- public/css/iconfont/iconfont.js | 2 +- public/css/iconfont/iconfont.json | 21 ++++++++ public/css/iconfont/iconfont.ttf | Bin 7496 -> 8256 bytes public/css/iconfont/iconfont.woff | Bin 4620 -> 5192 bytes public/css/iconfont/iconfont.woff2 | Bin 3796 -> 4308 bytes 7 files changed, 109 insertions(+), 7 deletions(-) diff --git a/public/css/iconfont/demo_index.html b/public/css/iconfont/demo_index.html index ce27f9e..674d33c 100644 --- a/public/css/iconfont/demo_index.html +++ b/public/css/iconfont/demo_index.html @@ -54,6 +54,24 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1741245710478') format('woff2'),
- url('iconfont.woff?t=1741245710478') format('woff'),
- url('iconfont.ttf?t=1741245710478') format('truetype');
+ src: url('iconfont.woff2?t=1750295665179') format('woff2'),
+ url('iconfont.woff?t=1750295665179') format('woff'),
+ url('iconfont.ttf?t=1750295665179') format('truetype');
}
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1750295665179') format('woff2'),
- url('iconfont.woff?t=1750295665179') format('woff'),
- url('iconfont.ttf?t=1750295665179') format('truetype');
+ src: url('iconfont.woff2?t=1750298631025') format('woff2'),
+ url('iconfont.woff?t=1750298631025') format('woff'),
+ url('iconfont.ttf?t=1750298631025') format('truetype');
}
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1750298631025') format('woff2'),
- url('iconfont.woff?t=1750298631025') format('woff'),
- url('iconfont.ttf?t=1750298631025') format('truetype');
+ src: url('iconfont.woff2?t=1750298885691') format('woff2'),
+ url('iconfont.woff?t=1750298885691') format('woff'),
+ url('iconfont.ttf?t=1750298885691') format('truetype');
}
xmH3q-m(=PwuMXJ1g>abnKhHgTmoK{RIs| zZU^@7KWJchfx?~U?kJkMA#DSHn0{4#_0${C;Q7qcxNyN4*C~+A3EQu0Pdm3et)~?F zyE>Kbj$XO`O)8x*qIEO)H{F&0M5S@1{*Fq&+re|4QAUASpwuI7)ZI3`QGmNUY`*ET z5sFXKNtdWrKt3S+2y9-yKmm$NKY>~|Ew37XVb#bzaS*6q zO`kS>zY9RE2_)i`n?9`@H(yRrxzGVOe2;U)@K=s*j_ql|X5G6wyEzBWd;de}O4?6G zaZLQ4zcthgaXy|D>+6${^m^lT1p&$N28i>?rg{0yji)Mklg~7N)2Vsl;zava9k$ $RspWCG*uPYb%x`+aQhMI)LzU;43?`>~`+kMDBf9+)_#7`%Hvf9!!m`n`tfNOCe zns6LpScYR5p=_Ltou)CX593Br7)LZ0^}#U;z;E>fjnRO?Dls5xKRJe{)`LReIMRkP zI1$h`YhNh+b5cGW 67(;fBg2LW3_*+`19J* z`%f0trmx@1eyr)oFN;~eaXz`cLkiM2+-VtX#{n=}48sus>c|Phz|LSmd5ofc0VqU7 zF)|>{uwgz>89)Q@k&hRN U_T;R z1JfW|(4O!!dwZ=AtuXn5BHgjV=70P&+`lHN5Qik?65h88i7O;tFK@kL4UK|SBP+cd z61h1eMtGa!2M|XctzNR=M2)zsnQu11?v `5(&FIyK5F)cpc55}4(cBSBlIJ&`=^iMBqU6>_%FYfd7X7WMm$CFWStn7lE$ zxnuH=e0e0_kay1C(6^~f5Rw2xU2O#b;bXJ~wFeM(qM>LM007Fo5{*VHCevLnL6ndz zPLM%$&h{yPpZ@4H5|Mfk4nEIUkEA}2whbwKPM|X==(7c#MB@wp@n)oJds#F7OW|+c zhfLHg-LfZq1&L$lxbW)R2qh{gtV5?zQ6KvLJXT@8XTP< n)1;-Se%BKoK!FPa|bxje`!Jmp41+Nv-64;lf5rd9-WAF;28%_=b)u?b) zulo&u$+G8Z`TxLz$aSl3SuFX23fzQ^?9*B`y2w=A=cIj*Gr7hzL(pzgZQH(&luZ|? zEZ#8SX}Iag8Ju=U0jc8oHUIa01BuBzW`cjt#KGeAot4g#0lxIgI<6(M*h|(_@W}au zMRDPLzC)1wR!E#i8#54ok~&ijquJ`+^F^+I-t`|=_6ps0cS6~^#<;9ds%h4uRi*xD zKU{}SjdZ4_c1m4+!_>yC+coqw +82GS~}IW%Lv#GiS&( z Date: Thu, 3 Jul 2025 13:44:01 +0800 Subject: [PATCH 4/6] master --- src/pages/calcTable/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 52e4e4e..25f1661 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -198,7 +198,7 @@ const index: FunctionComponent = (props) => { return ( - + {text} {record.lockItems && record.lockItems.includes(item.dataIndex) ? : null} From 49634c9285404e80406c5a8ec48d2e3bdd0c9aec Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 14 Jul 2025 14:47:27 +0800 Subject: [PATCH 5/6] master --- src/pages/unitTable/renderColsOpts.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index c38e0ee..a660bb2 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -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: }; + }) + ]; } return initialState; }, [initialState, type, i18n, extraParams]); From 4ac19f78fd881e6086b9f334e81ffd7832a7b2a0 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 22 Aug 2025 15:00:57 +0800 Subject: [PATCH 6/6] master --- src/pages/unitTable/renderColsOpts.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index a660bb2..fe3adc2 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -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":