From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index e348b99..42d2f4e 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -85,12 +85,23 @@
status.requestMode = status.requestMode || 'system'
status.procMode = status.procMode || 'script'
status.callbackType = status.callbackType || 'script'
+ let regoptions = Utils.getRegOptions(search)
+
+ if (config.urlFields && config.urlFields.length > 0) {
+ config.urlFields.forEach(field => {
+ regoptions.push({
+ key: field,
+ value: '0',
+ type: 'url'
+ })
+ })
+ }
this.setState({
setting: _setting,
search: _search,
arr_field: arr_field.join(','),
- regoptions: Utils.getRegOptions(search), // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
+ regoptions: regoptions, // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
scripts: _scripts,
preScripts: _preScripts,
@@ -157,11 +168,11 @@
const { activeKey, setting, scripts, preScripts, cbScripts } = this.state
let _loading = false
- if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
+ if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
- } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql')) {
+ } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.preScriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
- } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql')) {
+ } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.cbScriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
}
@@ -171,7 +182,7 @@
message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
duration: 5
})
- return
+ return Promise.reject()
}
if (trigger) {
@@ -293,11 +304,11 @@
const { activeKey, search, arr_field, setting } = this.state
let _loading = false
- if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
+ if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
- } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql')) {
+ } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.preScriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
- } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql')) {
+ } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.cbScriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
}
@@ -452,6 +463,7 @@
setting={setting}
scripts={scripts}
defaultSql={defaultSql}
+ urlFields={config.urlFields}
searches={this.props.search}
scriptsChange={this.scriptsChange}
scriptsUpdate={this.scriptsUpdate}
@@ -469,6 +481,7 @@
setting={setting}
scripts={preScripts}
regoptions={regoptions}
+ urlFields={config.urlFields}
searches={this.props.search}
scriptsUpdate={this.preScriptsUpdate}
wrappedComponentRef={(inst) => this.preScriptsForm = inst}
--
Gitblit v1.8.0