From b6c7f588b831d6fa4eb23b50ec08ea0b263a0717 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 六月 2024 20:27:56 +0800
Subject: [PATCH] 2024-06-17

---
 src/menu/components/form/formaction/actionform/index.jsx |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index ff0fa6f..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') {
@@ -372,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