From c62724a2cdbafa3c660538955acbedafa5a01871 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:25:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index c00ec97..3f88b64 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -723,6 +723,10 @@
} else if (value === 'custom') {
_fieldval.Ot = 'required'
}
+ if (_fieldval.Ot === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
+ }
if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
_fieldval.Ot = 'requiredSgl'
@@ -741,6 +745,9 @@
if (appType !== 'mob' && value === 'notRequired') {
this.record.control = ''
_fieldval.control = ''
+ } else if (value === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
}
} else if (key === 'pageTemplate') {
if (value === 'pay') {
--
Gitblit v1.8.0