From f3167f8371d19d0ea8fe7d0e7af5517ff0b08cd2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 07 四月 2021 23:25:29 +0800 Subject: [PATCH] 2021-04-07 --- src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx index f6474c0..a66ce20 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 } @@ -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 } -- Gitblit v1.8.0