From 7160438153e29bb7a8068a1c597f7752c9e190bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E6=9E=97=E8=BD=A9=E2=80=9D?= <317035359@qq.com> Date: Thu, 23 Oct 2025 16:41:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=93=E5=8D=B0=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/PrintNode/printTemplate/Template1.tsx | 10 +++++----- .../Components/PrintNode/printTemplate/drafts.tsx | 10 +++++----- 2 files changed, 10 insertions(+), 10 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 cf374f629..90d1b9b51 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx @@ -1065,7 +1065,7 @@ const Template1: FC = ({ subdataitem: any, subdataindex: number, ) => { - let tdValue = subItem[subdataitem.id]; + let tdValue = subItem[subdataitem.id]??subItem[subdataitem.code]; if (typeof tdValue === 'undefined') { const fields = current.instanceData?.fields[ @@ -1082,7 +1082,7 @@ const Template1: FC = ({ subdataitem.propId, ); if (curField) { - tdValue = subItem[curField.id]; + tdValue = subItem[curField.id]??subItem[curField.code]; } } } @@ -1129,12 +1129,12 @@ const Template1: FC = ({ subdataitem.valueType, ) ? (
{tdValue}
- ) : subItem[ + ) : (subItem[ subdataitem.id - ] !== undefined ? ( + ]??subItem[subdataitem.code]) !== undefined ? ( = ({ subdataitem.valueType, ) ? (
- {subItem[subdataitem.id]} + {subItem[subdataitem.id]??subItem[subdataitem.code]}
- ) : subItem[ + ) : (subItem[ subdataitem.id - ] !== undefined ? ( + ]??subItem[subdataitem.code]) !== undefined ? (