From 6b699dc5a69457d76577d17903d54011a6561d97 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:48:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 4a4bd91..e83ff55 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -7,6 +7,7 @@
import asyncComponent from '@/utils/asyncComponent'
import KeyInterface from '@/components/keyInterface'
+import MkPrintTemps from './mkPrintTemps'
import './index.scss'
const { TextArea } = Input
@@ -353,7 +354,12 @@
}
} else if (openType === 'excelOut') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
- reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredOnce'].includes(op.value))
+
+ if (appType === 'mob') {
+ reOptions.Ot = requireOptions.filter(op => ['notRequired'].includes(op.value))
+ } else {
+ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredOnce'].includes(op.value))
+ }
if (this.record.intertype === 'outer') {
shows.push('innerFunc', 'sysInterface', 'outerFunc')
@@ -381,7 +387,9 @@
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
shows.push('resetPageIndex')
}
- if (this.record.Ot !== 'notRequired' && this.record.Ot !== 'requiredOnce') {
+ if (this.record.Ot !== 'notRequired' && appType === 'mob') {
+ this.record.Ot = 'notRequired'
+ } else if (this.record.Ot !== 'notRequired' && this.record.Ot !== 'requiredOnce') {
this.record.Ot = 'notRequired'
}
} else if (openType === 'popview') {
@@ -923,6 +931,12 @@
}
content = <TextArea rows={2} readOnly={item.readonly}/>
+ } else if (item.type === 'printTemps') {
+ rules = [
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
+ ]
+
+ content = <MkPrintTemps />
} else if (item.type === 'keyinterface') {
span = 24
className = 'textarea'
@@ -995,6 +1009,10 @@
values.verify.sheet = values.verify.sheet || 'Sheet1'
}
+
+ if (values.verify) {
+ values.verify.scripts = []
+ }
} else if (card.OpenType === 'excelIn' && values.OpenType === 'excelOut') {
if (values.verify && values.verify.columns && values.verify.columns.length > 0) {
values.verify.columns = values.verify.columns.map(col => {
@@ -1016,6 +1034,10 @@
return col
})
}
+
+ if (values.verify) {
+ values.verify.scripts = []
+ }
}
if (values.OpenType === 'form') {
--
Gitblit v1.8.0