From e83e0dd1b6fffd09c48561f3b69fa5a50df4a942 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 04 二月 2021 19:01:01 +0800
Subject: [PATCH] 2021-02-04
---
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 464e035..a77dfb6 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -676,13 +676,13 @@
}
handleConfirm = () => {
- const { setting } = this.props
+ const { setting, card } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
- values.uuid = this.props.card.uuid
- values.verify = this.props.card.verify || null
+ values.uuid = card.uuid
+ values.verify = card.verify || null
if (values.OpenType === 'excelIn') {
values.position = 'toolbar'
@@ -704,10 +704,15 @@
} else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
values.position = 'toolbar'
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
- if (values.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(this.props.card.Ot)) {
+ if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
values.verify.uniques = []
- } else if (this.props.card.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(values.Ot)) {
- values.verify.uniques = []
+ }
+ if (card.Ot !== values.Ot) {
+ if (values.Ot === 'notRequired') {
+ values.verify.invalid = 'false'
+ } else if (card.Ot === 'notRequired' && values.Ot !== 'notRequired') {
+ values.verify.invalid = 'true'
+ }
}
}
--
Gitblit v1.8.0