From b78198e00a34eaa2b0a761bb6f42bf14e7771883 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:53:44 +0800
Subject: [PATCH] 2024-06-21
---
src/menu/components/form/formaction/actionform/index.jsx | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 33ebafb..a46a9ca 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -105,9 +105,9 @@
shows.push('innerFunc')
} else {
shows.push('sql', 'sqlType')
- if (this.record.execSuccess === 'never' && this.record.resetForms && this.record.resetForms[0]) {
- shows.push('returnValue')
- }
+ // if (this.record.execSuccess === 'never' && this.record.resetForms && this.record.resetForms[0]) {
+ // shows.push('returnValue')
+ // }
}
if (this.record.linkmenu && this.record.linkmenu !== 'goback') {
@@ -170,7 +170,6 @@
getFields() {
const { getFieldDecorator } = this.props.form
- const { interType, callbackType } = this.state
const fields = []
this.state.formlist.forEach((item, index) => {
@@ -206,7 +205,7 @@
message: formRule.func.maxMessage
}]
} else if (item.key === 'output') {
- if (interType === 'system' || ((interType === 'outer' || interType === 'custom') && callbackType === 'script')) {
+ if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
_rules = [{
pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
@@ -373,8 +372,12 @@
if (values.outerBlacklist) {
values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
}
- if (values.resetForms && values.resetForms.length === 0) {
- values.resetForms = null
+ if (values.resetForms) {
+ if (values.resetForms.length === 0) {
+ values.resetForms = null
+ } else {
+ values.returnValue = 'true'
+ }
}
resolve(values)
} else {
--
Gitblit v1.8.0