diff --git a/src/executor/design/pageBuilder/elements/tools/rfid/posteCmd.ts b/src/executor/design/pageBuilder/elements/tools/rfid/posteCmd.ts index cb3e9dbbeb70a2a6cbc0fed1887373ff504ee438..22c909fb6001b791c273ad1739353f60dd94aa60 100644 --- a/src/executor/design/pageBuilder/elements/tools/rfid/posteCmd.ts +++ b/src/executor/design/pageBuilder/elements/tools/rfid/posteCmd.ts @@ -40,8 +40,7 @@ const getDetailCmd = ( ',' + data1 + `${data1 ? ':' : ''}` + - ' ' + - data2 + `${data2 ? data2.toString().trim() : data2}` ); }; const getContentCmd = (contentArr: IContent[], config: IConfig) => { diff --git a/src/executor/design/pageBuilder/elements/widgets/searchPage/TableContentWithGridData.tsx b/src/executor/design/pageBuilder/elements/widgets/searchPage/TableContentWithGridData.tsx index 3f282ce63d9d21f71f5e8b891804bdc4091ce8a3..530e39eef9d109073d1b26e9d42ec4597fca8cac 100644 --- a/src/executor/design/pageBuilder/elements/widgets/searchPage/TableContentWithGridData.tsx +++ b/src/executor/design/pageBuilder/elements/widgets/searchPage/TableContentWithGridData.tsx @@ -116,7 +116,7 @@ const View: React.FC = ({ ctx, ...props }) => { qrcodeConfig.forEach((conf: any) => { finDataAry.push({ title: conf.label, - text: fieldMapping(conf, item[conf.value]), + text: fieldMapping(conf, item['T' + conf.value]), id: conf.value, }); finDataObj.set(item[config['qrcodeSource']], finDataAry); diff --git a/src/executor/open/form/detail/print.tsx b/src/executor/open/form/detail/print.tsx index cd9a0de51fc79e7bbe0305fb772c5c4dd9e6ae89..aa7fea514a58bf39bcb8f0c3267f67831b23b020 100644 --- a/src/executor/open/form/detail/print.tsx +++ b/src/executor/open/form/detail/print.tsx @@ -62,8 +62,12 @@ const ThingPrint: React.FC = ({ card.forEach((templates) => { let dataStr = ''; templates.forEach((item) => { + const contain = item.field.includes('('); const wordField = item.field.replace(/\(/g, ''); - const fieldWidth = wordField.length * 12 > 26 ? wordField.length * 12 : 26; + const wordFieldLength = contain + ? wordField.length * 10.2 + : wordField.length * 11.6; + const fieldWidth = wordFieldLength > 26 ? wordFieldLength : 26; dataStr += `