From c33ac9ddcdbed91bd2267bed2a96199441806a04 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 九月 2022 17:00:15 +0800
Subject: [PATCH] 2022-09-22
---
src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
index 38552f7..8f182b8 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
@@ -35,6 +35,18 @@
let _setting = fromJS(config.setting).toJS()
let _scripts = _setting.scripts || []
+ if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ window.GLOB.funcs.forEach(m => {
+ let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig')
+ _scripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ })
+ if (_setting.dataresource) {
+ _setting.dataresource = _setting.dataresource.replace(reg, `$ex@${m.func_code}@ex$`)
+ }
+ })
+ }
+
this.setState({
setting: _setting,
scripts: _scripts
@@ -74,7 +86,7 @@
let _loading = false
if (this.scriptsForm && this.scriptsForm.state.editItem) {
_loading = true
- } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
+ } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
}
@@ -123,16 +135,17 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
+ let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: SettingUtils.getDebugSql(setting, _scripts)
+ LText: SettingUtils.getDebugSql(setting, _scripts, timestamp)
}
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
+ param.timestamp = timestamp
+ param.secretkey = Utils.encrypt('', timestamp)
- Api.getLocalConfig(param).then(result => {
+ Api.genericInterface(param).then(result => {
if (result.status) {
_resolve()
} else {
@@ -192,7 +205,7 @@
let _loading = false
if (this.scriptsForm && this.scriptsForm.state.editItem) {
_loading = true
- } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
+ } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
_loading = true
}
@@ -236,9 +249,9 @@
const { activeKey, setting, loading, scripts } = this.state
return (
- <div className="model-tree-setting-form-box" id="model-setting-form-body">
+ <div className="model-tree-setting-form-box">
{loading && <Spin size="large" />}
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}>
+ <Tabs activeKey={activeKey} onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
menu={menu}
@@ -253,7 +266,7 @@
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } key="scripts">
+ } key="scripts" id="mk-setting-scripts">
<CustomScript
dict={this.props.dict}
setting={setting}
--
Gitblit v1.8.0