From e9d63015b772bd69811e50f46475bf6d30c978c1 Mon Sep 17 00:00:00 2001 From: lx991218 <317035359@qq.com> Date: Thu, 25 Jul 2024 17:04:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=8A=9E=E4=BA=8B=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=89=93=E5=8D=B0=E8=A1=A8=E6=A0=BC=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=80=81=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/Components/PrintNode/printTemplate/Template1.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx index 5a6e15ff4..a7e47cacd 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx @@ -95,7 +95,10 @@ const Template1: FC = ({ printData, current, loading, styleTemplate, pri beforeNameData.push(current.instanceData!.fields[key]); } updatedChangeArr.forEach((item: any) => { - if (item.valueType == '分类型' && current.instanceData) { + if ( + (item.valueType == '分类型' || item.property.valueType == '分类型') && + current.instanceData + ) { const curData = beforeNameData .flat() .filter((item2: any) => item2.id == item.id)[0]; @@ -109,7 +112,6 @@ const Template1: FC = ({ printData, current, loading, styleTemplate, pri } } }); - setCheChangeAttributes(updatedChangeArr); } }); -- Gitee From 9ab089e55ada9fce7876f8181dff5c91f0958ccc Mon Sep 17 00:00:00 2001 From: lx991218 <317035359@qq.com> Date: Fri, 26 Jul 2024 16:42:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=90=88=E8=AE=A1=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E8=BF=87=E6=BB=A4bug=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8A=9E=E4=BA=8B=E6=8C=89=E9=92=AE=E5=92=8C=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E6=B5=81=E7=A8=8B=E8=BF=9B=E5=85=A5=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E6=97=B6=E9=97=B4=E5=86=B2?= =?UTF-8?q?=E7=AA=81bug=EF=BC=8C=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=AE=BE=E7=BD=AE=E5=92=8C=E5=86=85=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D=E5=86=B2=E7=AA=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/PrintNode/Template/Template1.tsx | 14 ++++++++++++-- .../PrintNode/Template/designer.module.less | 1 + .../Config/Components/PrintNode/Template/index.tsx | 3 +++ .../PrintNode/printCreate/designer.module.less | 1 + .../PrintNode/printTemplate/designer.module.less | 1 + .../Design/config/Template/designer.module.less | 1 + .../open/form/printTemplate/designer.module.less | 1 + src/executor/tools/task/index.tsx | 11 +++++++---- 8 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/Template1.tsx b/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/Template1.tsx index 3f668f910..8fcab666d 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/Template1.tsx +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/Template1.tsx @@ -58,6 +58,7 @@ const Template1: FC = ({ fields, forms, printType, print, resource }) => const [sumPrimaryValue, setSumPrimaryValue] = useState(''); const [radioValue2, setRadioValue2] = useState(1); const [treeIndexNumber, setTreeIndexNumber] = useState(1); + const [keysForms, setKeysForms] = useState([]); const [tableListIndex, setTableListIndex] = useState<{ index: number; index2: number; @@ -97,7 +98,9 @@ const Template1: FC = ({ fields, forms, printType, print, resource }) => setSumShow(true); }; const showSumDialogKey = (key: string) => { - const sumFields = fields.filter((item: any) => item.valueType === '分类型'); + const sumFields = fields + .filter((item: any) => item.valueType === '分类型') + .filter((item: any) => keysForms.includes(item.xfield.formId)); setSumFields(sumFields); setSumKey(key); setSumShowKey(true); @@ -281,6 +284,12 @@ const Template1: FC = ({ fields, forms, printType, print, resource }) => }); } }); + let nweKeysForms: any = []; + const dData = forms.filter((item: any) => item.xform.type === '子表'); + dData.forEach((item: any) => { + nweKeysForms.push(item.xform.formId); + }); + setKeysForms(nweKeysForms); }, []); useEffect(() => { setTitle(printType); @@ -1417,7 +1426,7 @@ const Template1: FC = ({ fields, forms, printType, print, resource }) => open={sumShowKey} onOk={() => { if (sumKey == 'primary') { - const sumCheckFields = sumFields.filter( + const sumCheckFields: any = sumFields.filter( (cur: any) => cur.id == sumPrimaryValue, ); const tree = buildTree(sumCheckFields[0].lookups, undefined, 1); @@ -1445,6 +1454,7 @@ const Template1: FC = ({ fields, forms, printType, print, resource }) => cur.valueType === '数值型') + .filter((item: any) => keysForms.includes(item.xfield.formId)) .map((item: any) => ({ label: item.xfield.caption, value: item.id, diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/designer.module.less b/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/designer.module.less index 32fa589f1..b3ed9b825 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/designer.module.less +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/designer.module.less @@ -38,6 +38,7 @@ } .printContent td{ text-align:center; + padding: 0; } .printTips{ margin: 0 auto; diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/index.tsx b/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/index.tsx index 57f512c19..784a41e98 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/index.tsx +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/Template/index.tsx @@ -92,6 +92,7 @@ const Templates: FC = ({ ...a, xfield: { name: xform.id + '-' + a.id, + formId: xform.id, caption: name, dataField: a.code, dataType: 'string', @@ -135,6 +136,7 @@ const Templates: FC = ({ return { ...a, xform: { + type: '子表', id: a.id, formId: a.id, key: a.id, @@ -150,6 +152,7 @@ const Templates: FC = ({ return { ...a, xform: { + type: '主表', id: a.id, formId: a.id, key: a.id, diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/printCreate/designer.module.less b/src/components/Common/FlowDesign/Config/Components/PrintNode/printCreate/designer.module.less index 4642fdb1e..c6d3bac6c 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/printCreate/designer.module.less +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/printCreate/designer.module.less @@ -38,6 +38,7 @@ } .printContent td{ text-align:center; + padding: 0; } .printSubtitleContent{ width: 100%; diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/designer.module.less b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/designer.module.less index a6d92834a..871ea243f 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/designer.module.less +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/designer.module.less @@ -38,6 +38,7 @@ } .printContent td{ text-align:center; + padding:0; } .printTips{ margin: 0 auto; diff --git a/src/components/DataStandard/WorkForm/Design/config/Template/designer.module.less b/src/components/DataStandard/WorkForm/Design/config/Template/designer.module.less index 32fa589f1..c0333f512 100644 --- a/src/components/DataStandard/WorkForm/Design/config/Template/designer.module.less +++ b/src/components/DataStandard/WorkForm/Design/config/Template/designer.module.less @@ -38,6 +38,7 @@ } .printContent td{ text-align:center; + padding:0; } .printTips{ margin: 0 auto; diff --git a/src/executor/open/form/printTemplate/designer.module.less b/src/executor/open/form/printTemplate/designer.module.less index a6d92834a..871ea243f 100644 --- a/src/executor/open/form/printTemplate/designer.module.less +++ b/src/executor/open/form/printTemplate/designer.module.less @@ -38,6 +38,7 @@ } .printContent td{ text-align:center; + padding:0; } .printTips{ margin: 0 auto; diff --git a/src/executor/tools/task/index.tsx b/src/executor/tools/task/index.tsx index 02332fe63..fca1e6cfb 100644 --- a/src/executor/tools/task/index.tsx +++ b/src/executor/tools/task/index.tsx @@ -75,10 +75,10 @@ const TaskContent: React.FC = ({ current, finished }) => { } }); setPrint(current.instanceData.node.print); + setPrintLoaded(true); } } }); - setPrintLoaded(true); } } catch (error) { console.error('Error fetching data:', error); @@ -184,7 +184,8 @@ const TaskContent: React.FC = ({ current, finished }) => {
{current.instance.content}
- {printLoaded && ( + {((printLoaded && resource.print.length > 0) || + resource.print.length == 0) && ( { setPrintModalCreate(true); @@ -192,7 +193,8 @@ const TaskContent: React.FC = ({ current, finished }) => { 添加打印模板 )} - {printLoaded && ( + {((printLoaded && resource.print.length > 0) || + resource.print.length == 0) && ( = ({ current, finished }) => { )} /> )} - {printLoaded && ( + {((printLoaded && resource.print.length > 0) || + resource.print.length == 0) && (