From 89fb1308d92e10a27cf8f91f4dd766eb38976e12 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十一月 2020 21:56:42 +0800
Subject: [PATCH] 2020-11-26
---
src/menu/actioncomponent/actionform/index.jsx | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/menu/actioncomponent/actionform/index.jsx b/src/menu/actioncomponent/actionform/index.jsx
index 3c00ca0..99a6a01 100644
--- a/src/menu/actioncomponent/actionform/index.jsx
+++ b/src/menu/actioncomponent/actionform/index.jsx
@@ -48,9 +48,6 @@
text: this.props.dict['header.form.requiredOnce']
}],
insertUpdateOptions: [{
- value: '',
- text: this.props.dict['model.empty']
- }, {
value: 'insert',
text: this.props.dict['header.form.action.insert']
}, {
@@ -153,7 +150,7 @@
_options.push('execMode', 'intertype', 'innerFunc', 'Ot', 'execSuccess', 'execError')
}
}
- } else if (_opentype === 'popview' && _opentype === 'tab') {
+ } else if (_opentype !== 'popview' && _opentype !== 'tab') {
if (_intertype === 'outer') {
_options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
@@ -598,9 +595,7 @@
values.OpenType = values.execMode
}
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
- if (values.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(this.props.card.Ot)) {
- values.verify.uniques = []
- } else if (this.props.card.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(values.Ot)) {
+ if ((values.Ot === 'requiredOnce' || this.props.card.Ot === 'requiredOnce') && this.props.card.Ot !== values.Ot) {
values.verify.uniques = []
}
}
--
Gitblit v1.8.0