From 935b933d984b006e8f4ff857d8c243a8c6066ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E9=AA=8F=E8=BE=89?= <2807466517@qq.com>
Date: Mon, 21 Jul 2025 17:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=A1=A8=E5=8D=95=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E4=B8=8B=E7=BA=A7=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=EF=BC=8C=E5=BE=97=E5=AE=9E=E6=89=93=E5=8D=B0=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E5=BD=93metadata=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E7=9A=84?=
=?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/executor/index.tsx | 6 ++++++
src/executor/open/form/detail/rfidprint/dasprint.tsx | 4 ++--
src/ts/core/public/operates.ts | 6 ++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/executor/index.tsx b/src/executor/index.tsx
index be7aa6708..7186f0bbd 100644
--- a/src/executor/index.tsx
+++ b/src/executor/index.tsx
@@ -12,6 +12,7 @@ import GetAuthKeyModal from './getAuthKey';
import ThingPrint from './open/form/detail/print';
import { DasPrint } from '@/executor/open/form/detail/rfidprint/dasprint';
import { PoskPrint } from '@/executor/open/form/detail/rfidprint/postekprint';
+import FormView from './open/form';
const Executor: React.FC = () => {
const history = useHistory();
@@ -53,6 +54,11 @@ const Executor: React.FC = () => {
case 'dataAnalysis':
setContent();
return;
+ case 'oldFormView': {
+ const [form] = args;
+ setContent( setContent(<>>)} />);
+ return;
+ }
case 'lookSubscribe': {
const file = args[0] as IFile;
const item = file.directory.target.space.manager.find(file.id);
diff --git a/src/executor/open/form/detail/rfidprint/dasprint.tsx b/src/executor/open/form/detail/rfidprint/dasprint.tsx
index 850533c0e..3255f5e7a 100644
--- a/src/executor/open/form/detail/rfidprint/dasprint.tsx
+++ b/src/executor/open/form/detail/rfidprint/dasprint.tsx
@@ -33,8 +33,8 @@ let port;
export const DasPrint: React.FC = ({form, things, configData, finished }) => {
// 读取配置
useEffect(()=>{
- if(form.metadata.DSRFIDConfig){
- printForm = form.metadata.DSRFIDConfig
+ if(form.metadata && form.metadata.DSRFIDConfig){
+ printForm = form.metadata.DSRFIDConfig;
console.log(printForm);
}
},[])
diff --git a/src/ts/core/public/operates.ts b/src/ts/core/public/operates.ts
index 10302867c..576bc0511 100644
--- a/src/ts/core/public/operates.ts
+++ b/src/ts/core/public/operates.ts
@@ -25,6 +25,12 @@ export const entityOperates = {
label: '数据分析',
iconType: 'open',
},
+ {
+ sort: 3,
+ cmd: 'oldFormView',
+ label: '打开表单(另)',
+ iconType: 'open',
+ },
],
},
GroupOpen: {
--
Gitee