From e794d1021f82ce45d4af798bc59d6fd4ae9daa98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 29 Nov 2023 17:20:44 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/OCTable/index.tsx | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/pages/OCTable/index.tsx b/src/pages/OCTable/index.tsx index ab8d780..87ca8bf 100644 --- a/src/pages/OCTable/index.tsx +++ b/src/pages/OCTable/index.tsx @@ -47,7 +47,15 @@ const OCTable: FC = (props) => { const showDifference = record[`${item["dataIndex"]}_type`] === "number"; const { acctResultValue, excelResultValue } = record[item["dataIndex"]] || {}; return
console.log(formulaDesc)}> + onClick={() => { + window.parent.postMessage( + { + type: "turn", + payload: { id: "FORMULA", params: { formulaDesc } } + }, + "*" + ); + }}>
{lanObj["系统值"]}： {acctResultValue} @@ -80,14 +88,18 @@ const OCTable: FC = (props) => { const sizeChange = (pageobj: IPage) => { }; const onChange = (pageobj: IPage) => { - setPageInfo({ ...pageInfo, ...pageobj }); - window.parent.postMessage( - { - type: "turn", - payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } - }, - "*" - ); + const { pageNum, size: pageSize } = pageobj; + setPageInfo((prevState) => { + const { size } = prevState; + window.parent.postMessage( + { + type: "turn", + payload: { id: "PAGEINFO", params: { ...pageInfo, pageNum: size === pageSize ? pageNum : 1, size: pageSize } } + }, + "*" + ); + return { ...pageInfo, current: size === pageSize ? pageNum : 1, size: pageSize }; + }); }; return Date: Wed, 6 Dec 2023 11:16:44 +0800 Subject: [PATCH 2/9] master --- src/pages/atdTable/components/index.less | 16 +++++++++++++++- src/utils/common.js | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 7577694..8aa9522 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -165,6 +165,12 @@ } } + tr:hover .editable-cell { + padding: 4px 11px; + border: 1px solid #d9d9d9; + border-radius: 2px; + } + :global { .ant-btn-link { height: inherit !important; @@ -260,7 +266,15 @@ } th, td { - font-size: 12px + font-size: 12px; + + .ant-form-item { + margin-bottom: 0; + + .ant-input-number { + width: 100%; + } + } } } } diff --git a/src/utils/common.js b/src/utils/common.js index 5fcaa49..5096b1a 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -110,3 +110,16 @@ export const paginationAction = (pageInfo = {}, i18n = {}, onChange, onShowSizeC showSizeChanger: true }; }; +/* + * Author: 黎永顺 + * Description: + * Params: 格式化钱 + * Date: 2023/12/6 + */ +export const toDecimal_n = (num, decimalPlaces) => { + if (num === null || !isFinite(num)) return null + if (decimalPlaces < 0) return null; + const multiplier = Math.pow(10, decimalPlaces); + const roundedNum = Math.round(num * multiplier) / multiplier; + return roundedNum.toFixed(decimalPlaces); +}; From 0c00895f180eff282443e915e6e531b8f6e88503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 6 Dec 2023 11:42:12 +0800 Subject: [PATCH 3/9] =?UTF-8?q?custom/=E9=B2=81=E6=8E=A7=E6=95=B0=E5=AD=97?= =?UTF-8?q?-=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/iconfont/demo_index.html | 29 +++++++++++++++++++++++++--- public/css/iconfont/iconfont.css | 10 +++++++--- public/css/iconfont/iconfont.js | 2 +- public/css/iconfont/iconfont.json | 7 +++++++ public/css/iconfont/iconfont.ttf | Bin 5272 -> 5580 bytes public/css/iconfont/iconfont.woff | Bin 3240 -> 3428 bytes public/css/iconfont/iconfont.woff2 | Bin 2580 -> 2800 bytes 7 files changed, 41 insertions(+), 7 deletions(-) diff --git a/public/css/iconfont/demo_index.html b/public/css/iconfont/demo_index.html index 83eb5ca..aa55039 100644 --- a/public/css/iconfont/demo_index.html +++ b/public/css/iconfont/demo_index.html @@ -54,6 +54,12 @@
    +
  • + +
    批量更新
    +
    &#xe696;
    +
    • +
  • 全部
    @@ -138,9 +144,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1698914262517') format('woff2'),
-       url('iconfont.woff?t=1698914262517') format('woff'),
-       url('iconfont.ttf?t=1698914262517') format('truetype');
+  src: url('iconfont.woff2?t=1701833672416') format('woff2'),
+       url('iconfont.woff?t=1701833672416') format('woff'),
+       url('iconfont.ttf?t=1701833672416') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    @@ -166,6 +172,15 @@
      +
    • + +
      + 批量更新 +
      +
      .icon-pilianggengxin +
      +
      • +
    • @@ -292,6 +307,14 @@
        +
      • + +
        批量更新
        +
        #icon-pilianggengxin
        +
        • +

      • ;u;70Wg#|+eCQcypa#DY)N5O`@`J0Cf*Pb0Npi38y1uBP zB0>5nZ0MH#k>}jrm!N}TNu|woP?677{6l8c)2xlNS0t$^V*(3WlTBf2b8->&qG)ZZ z_0Z^F@97=I{+0qsbjl-?=eZ1iIVfv?w3q^aAPo4ZB2)P;Qa%}%b zf#)N87q#_v<946*b`?~zo37c% z@k%{*DUeLh%8?2+dhts&X$twNWBH~_p@$V4TEqKJ_sah9V<9*P=zV`gya7R>wH-79 z)}I%VN$YY_YSxBKXv!Kxxy_1_M9Q@gns2xWaF4+NJR)FZV6Xtoi9BNSWBI8_h@sS4 z#yydwHc!Hod~a;dL#9GGh&uGR9JoqcSJ+XIbkjXNAc19LSc}EBlnGK^vS!| z^xdiTweo3jPbx<;gT3or=3l_GcKu9TOH!y0Zf6i|?bh)=yXm8oJS?*kZze*@Ihw zj@{c2pVt=ejN(9K!`H$}_50iJkM!-BZ@Dx(cD5N#GoCGS5$j73dJIod*N3!&0LbZJ?Nc#ZzxWMM`uFjO@4AXhB^}YKx z^?uWSwe9}>4ATKI(=ZC%yFLwbM6*)?1 zbGmn{VHu!}Xj-NMN8D_G;bO*dM-9jPWK*GLb!QD{cE*;S(#_=aaf-f*&AK`c%Y30D z;^D(baK!7~kLWlYv3WqqcjWH8zLGN!j`t<_69&vW*k4gOTqJ+d`QvA*WXTF1va2*c zX)N!r#s_02g_ZUZuUdN_cpu7VN9ilK{|e04or7St6)#~bNk9pIji%t@DP@G5a6&k5 z;xySsky!o2(p(^x$i1?9ln6k;8h}Vd5D*gqC(Svbv1wQlaLS_X_YWt7XtUM_5g_;} zu@q51hK1wg=2L(mnh?qW){-9~u$u@3&IC~l5E$2%M4OJIHsXgLg$U4z z2C@R0goQ#%j;$pCqQ*qgDg;W=`=%2Nn#cq(dj$*gZ6!)O|M*{A8zA)`pnhbzps{aN zcpx2REf`-qb2!(`mtuD+DDP?AldoH^cnL?SNm0INLK|{_j;SA-9;#2U3r8<5tuu-r zmEcd|LpF+kC?ed72}j%uh06ynp(8@1f#t(!ez@eZCa+Rp=`4< zW9$N0<3)qp9SpcU#SMclSJ2%dO>c{{ooZ}MNs=o*#^2jmYU909HbC5Bt=wr^qhu^* z>x^kZGy`#euD%(f_eXC(obUERet#BnX*sD+xNUOVfKC+dlay>K*RpKcmgUzRTT|X) ze&PZTyAC?^69DoYc7V0_5B7%5W)c7}H+=@kFW54c5KED=kI+%=A>0EC$&<_JSp`7e z&knLmMgL*8yiB3{KZqh>WyR%xn;I*8S83mzrk=Kc7cv=1NBlwnRG<+31o+tDjW|t( z<=d?%03G-2yNjA6Z7DY;7wSk~2zClUBM$;TX@*UB)P){JZvKqZqmIQCO2h+;rPzQ& zO1@$qS`-5XQYsc}kRPeH)*=esz(6=P02fA}m_Wd~VhRKH0z=Aa;E-~=n1_U1P$1>M zVhtvLesy?s>(Cr4Ez&t=HBR zsKNnW#*c>HGo->6WgAUv={!v;W->|+!=nNT&6Yoa-Cs>2u}JN{mH)msNb5YI5YZPe zDyQti!D2KM(5o6r+h!tH-?UX@TmcP*xdZTVGQ|KtaWatNb_>Z>|HvfRle0v>Fk|tye5^;=l8$y7j_* og)t%B#mx)-8`{ Date: Thu, 7 Dec 2023 09:22:54 +0800 Subject: [PATCH 4/9] =?UTF-8?q?master-=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/atdTable/components/index.less | 4 ++-- src/pages/calcTable/calcExplainFooter.tsx | 4 ++++ src/pages/calcTable/customTableTitle.tsx | 12 +++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 8aa9522..12cae05 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -86,7 +86,7 @@ .expand-th:hover { .toogle-lock-tool { - width: 30%; + width: 37%; } } @@ -118,7 +118,7 @@ justify-content: center; align-items: center; - & > :first-child { + & > :not(:last-child) { margin-right: 4px; } diff --git a/src/pages/calcTable/calcExplainFooter.tsx b/src/pages/calcTable/calcExplainFooter.tsx index 5799820..6b6fa3e 100644 --- a/src/pages/calcTable/calcExplainFooter.tsx +++ b/src/pages/calcTable/calcExplainFooter.tsx @@ -29,6 +29,10 @@ const CalcExplainFooter: FunctionComponent = (props) => { {i18n["当前状态未锁定，点击锁定"]}

      +
      + + {i18n["批量更新"]} +
      ); }; diff --git a/src/pages/calcTable/customTableTitle.tsx b/src/pages/calcTable/customTableTitle.tsx index 3931d39..cdcad41 100644 --- a/src/pages/calcTable/customTableTitle.tsx +++ b/src/pages/calcTable/customTableTitle.tsx @@ -13,20 +13,22 @@ interface OwnProps { dataIndex?: string; title?: string; lockStatus?: string; + dataType?: string; onHandleFormulatd?: any; i18n?: any; + pattern?: number; } type Props = OwnProps; const customTableTitle: FunctionComponent = (props) => { - const { dataIndex, title, lockStatus, onHandleFormulatd, i18n = {} } = props; + const { dataIndex, title, lockStatus, onHandleFormulatd, i18n = {}, pattern, dataType } = props; - const handleToggleSalaryItemVal = (salaryItemId: string, type: string) => { + const handleToggleSalaryItemVal = (salaryItemId: string, type: string, updateParams: any = {}) => { window.parent.postMessage( { type: "turn", - payload: { id: "LOCKING", params: { lockType: type, salaryItemId } } + payload: { id: "LOCKING", params: { lockType: type, salaryItemId, ...updateParams } } }, "*" ); @@ -42,6 +44,10 @@ const customTableTitle: FunctionComponent = (props) => { onClick={() => handleToggleSalaryItemVal(dataIndex as string, "LOCK")}/> handleToggleSalaryItemVal(dataIndex as string, "UNLOCK")}/> + handleToggleSalaryItemVal(dataIndex as string, "BATCHUPDATE", { + pattern, salaryItemName: title, dataType + })}/>
    }
From 6c79742e755d9d164f0b74dfc7a38ce69856a299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 7 Dec 2023 18:50:47 +0800 Subject: [PATCH 5/9] =?UTF-8?q?master-=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=80=82=E9=85=8D=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calcTable/customTableTitle.tsx | 5 +++-- src/pages/calcTable/index.tsx | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/calcTable/customTableTitle.tsx b/src/pages/calcTable/customTableTitle.tsx index cdcad41..c88df83 100644 --- a/src/pages/calcTable/customTableTitle.tsx +++ b/src/pages/calcTable/customTableTitle.tsx @@ -17,12 +17,13 @@ interface OwnProps { onHandleFormulatd?: any; i18n?: any; pattern?: number; + calcDetail?: boolean; //查看详情页面 } type Props = OwnProps; const customTableTitle: FunctionComponent = (props) => { - const { dataIndex, title, lockStatus, onHandleFormulatd, i18n = {}, pattern, dataType } = props; + const { dataIndex, title, lockStatus, onHandleFormulatd, i18n = {}, pattern, dataType, calcDetail } = props; const handleToggleSalaryItemVal = (salaryItemId: string, type: string, updateParams: any = {}) => { window.parent.postMessage( @@ -38,7 +39,7 @@ const customTableTitle: FunctionComponent = (props) => {
onHandleFormulatd(dataIndex)}>{title}
{ - !!lockStatus && + !!lockStatus && !calcDetail &&
handleToggleSalaryItemVal(dataIndex as string, "LOCK")}/> diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 8af2648..5a78abe 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -29,6 +29,7 @@ const index: FunctionComponent = (props) => { const [pageInfo, setPageInfo] = useState>({}); const [i18n, setI18n] = useState({}); const [showTotalCell, setShowTotalCell] = useState(false); + const [isDetailTable, setIsDetailTable] = useState(false); const [sumRowlistUrl, setSumRowlistUrl] = useState(""); const [payload, setPayload] = useState(""); @@ -44,10 +45,11 @@ const index: FunctionComponent = (props) => { if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {}, - showTotalCell = false, sumRowlistUrl = "", payload = {} + showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail } = data; setSumRowlistUrl(sumRowlistUrl); setShowTotalCell(showTotalCell); + setIsDetailTable(calcDetail); setI18n(i18nRes); setPayload(payload); setPageInfo(pageInfo); @@ -128,9 +130,10 @@ const index: FunctionComponent = (props) => { }; return (
} + columns={!isDetailTable ? columns : _.filter(columns, o => o.dataIndex !== "operate")} + footer={() => !isDetailTable ? : null} pagination={{ ...paginationFun(pageInfo, sizeChange, onChange, i18n), size: "default" From 104b36786c612a29b0eee9c63f82c7f89d40e262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 11 Dec 2023 14:45:15 +0800 Subject: [PATCH 6/9] master --- src/pages/reportTable/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx index 61c14c0..61f1fef 100644 --- a/src/pages/reportTable/index.tsx +++ b/src/pages/reportTable/index.tsx @@ -26,15 +26,15 @@ const ReportTable: FC = (props) => { setSumRow(countResult); setColumns(_.map(columns, (item, index: number) => { if (index === 0) { - return { ...item, fixed: "left" }; + return { ...item, fixed: "left", ellipsis: true }; } return { ...item, children: _.map(item.children, child => { return { - ...child, + ...child, ellipsis: true, render: (text: string, record: any) => { - return + + ) + } + ] : columns); + } + }; + const handleEdit = (record: any) => { + window.parent.postMessage({ type: "turn", payload: { id: "EDIT", params: { ...record } } }, "*"); + }; + 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 }; + }); + }; + return
; +}; + +export default TaxDeclareTable; From b992c06a21b578f2795541b6fd35f229d6f4bdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 29 Dec 2023 10:17:56 +0800 Subject: [PATCH 8/9] master --- src/pages/atdTable/components/index.less | 8 +++----- src/pages/calcTable/calcFixedTotal.tsx | 2 +- src/pages/taxDeclareTable/index.tsx | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 12cae05..7cded41 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -86,7 +86,7 @@ .expand-th:hover { .toogle-lock-tool { - width: 37%; + display: flex; } } @@ -102,17 +102,15 @@ height: 100%; .title-text { - width: 90%; + flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - flex: 1 1; cursor: pointer; } .toogle-lock-tool { - display: flex; - width: 0; + display: none; overflow: hidden; height: 100%; justify-content: center; diff --git a/src/pages/calcTable/calcFixedTotal.tsx b/src/pages/calcTable/calcFixedTotal.tsx index f6c50a1..b23504b 100644 --- a/src/pages/calcTable/calcFixedTotal.tsx +++ b/src/pages/calcTable/calcFixedTotal.tsx @@ -49,7 +49,7 @@ const calcFixedTotal: FunctionComponent = (props) => { return (<> { _.map(columns, (item: any, index) => { - return + return { loading ? : {sumRow[item.dataIndex] || "-"} diff --git a/src/pages/taxDeclareTable/index.tsx b/src/pages/taxDeclareTable/index.tsx index 2223e9e..1e4cef7 100644 --- a/src/pages/taxDeclareTable/index.tsx +++ b/src/pages/taxDeclareTable/index.tsx @@ -40,6 +40,7 @@ const TaxDeclareTable: FC = (props) => { render: (_: any, record: any) => ( + {/**/} ) } @@ -49,6 +50,9 @@ const TaxDeclareTable: FC = (props) => { const handleEdit = (record: any) => { window.parent.postMessage({ type: "turn", payload: { id: "EDIT", params: { ...record } } }, "*"); }; + const handleDelete = (record: any) => { + window.parent.postMessage({ type: "turn", payload: { id: "DELETE", params: { ...record } } }, "*"); + }; const onChange = (current: number, pageSize: number) => { setPageInfo((prevState) => { const { pageSize: size } = prevState; From 2f50be171ae2b188860cc24c0aedbc0a2dfaf262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 3 Jan 2024 14:31:31 +0800 Subject: [PATCH 9/9] master --- src/pages/calcTable/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 5a78abe..4343872 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -20,6 +20,7 @@ interface OwnProps { } type Props = OwnProps; +type fixedProps = boolean | "top" | "bottom"; const { Text } = Typography; const index: FunctionComponent = (props) => { @@ -32,6 +33,7 @@ const index: FunctionComponent = (props) => { const [isDetailTable, setIsDetailTable] = useState(false); const [sumRowlistUrl, setSumRowlistUrl] = useState(""); const [payload, setPayload] = useState(""); + const [fixed, setFixed] = useState(true); useEffect(() => { window.parent.postMessage({ type: "init" }, "*"); @@ -45,13 +47,15 @@ const index: FunctionComponent = (props) => { if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {}, - showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail + showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail, + fixed = true } = data; setSumRowlistUrl(sumRowlistUrl); setShowTotalCell(showTotalCell); setIsDetailTable(calcDetail); setI18n(i18nRes); setPayload(payload); + setFixed(fixed); setPageInfo(pageInfo); setDataSource(dataSource); setSelectedRowKeys(selectedRowKeys); @@ -140,7 +144,7 @@ const index: FunctionComponent = (props) => { }} summary={() => ( !showTotalCell ? <> : - + {i18n["总计"]}