From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a92b985..a6125a5 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -178,7 +178,7 @@
reReadonly.interface = false
reRequired.interface = true
} else if (intertype === 'outer') {
- shows.push('procMode', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackType', 'output')
+ shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType', 'output')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
@@ -194,6 +194,8 @@
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
+
+ shows.push('proInterface')
} else {
reReadonly.interface = true
reRequired.interface = false
@@ -241,7 +243,7 @@
reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom')
if (intertype === 'outer') {
- shows.push('procMode', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackType')
+ shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
@@ -257,6 +259,8 @@
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
+
+ shows.push('proInterface')
} else {
reReadonly.interface = true
reRequired.interface = false
@@ -288,13 +292,15 @@
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+ shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
reRequired.callbackFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
+
+ shows.push('proInterface')
} else {
reReadonly.interface = true
reRequired.interface = false
@@ -310,12 +316,14 @@
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
+ shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc')
reRequired.innerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
+
+ shows.push('proInterface')
} else {
reReadonly.interface = true
reRequired.interface = false
@@ -370,13 +378,15 @@
if (_funcType === 'print') {
shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+ shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
reRequired.callbackFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
+
+ shows.push('proInterface')
} else {
reReadonly.interface = true
reRequired.interface = false
@@ -419,6 +429,9 @@
} else if (_funcType === 'pay') {
shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ } else if (_funcType === 'refund') {
+ shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
}
}
--
Gitblit v1.8.0