From d3de0a6fff9ea94ab3c7f5b49cad56dad5d3c0b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 九月 2022 17:36:24 +0800
Subject: [PATCH] 2022-09-22
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a6125a5..29dcf6e 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -236,8 +236,10 @@
if (this.record.formType === 'switch') {
shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText')
- } else {
+ } else if (this.record.formType === 'radio') {
shows.push('field', 'openVal', 'closeVal')
+ } else {
+ shows.push('field')
}
reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom')
@@ -428,6 +430,9 @@
shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
} else if (_funcType === 'pay') {
shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
} else if (_funcType === 'refund') {
shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
@@ -878,9 +883,14 @@
values.modal = card.modal || null
if (values.OpenType === 'form') {
- if (/^(0|[1-9]\d*)$/.test(values.openVal) && /^(0|[1-9]\d*)$/.test(values.closeVal)) {
- values.openVal = +values.openVal
- values.closeVal = +values.closeVal
+ if (values.formType !== 'scan') {
+ if (/^(0|[1-9]\d*)$/.test(values.openVal) && /^(0|[1-9]\d*)$/.test(values.closeVal)) {
+ values.openVal = +values.openVal
+ values.closeVal = +values.closeVal
+ }
+ } else {
+ values.show = 'icon'
+ values.icon = 'scan'
}
} else if (values.OpenType === 'excelOut') {
values.Ot = 'notRequired'
--
Gitblit v1.8.0