From d3e3e32f62955e7ac7983bde70924daaacab5dc1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 九月 2020 13:33:37 +0800
Subject: [PATCH] 2020-09-08
---
src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx
similarity index 94%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx
index 06d871d..69fb0fd 100644
--- a/src/templates/sharecomponent/datasourcecomponent/verifycard/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx
@@ -127,9 +127,14 @@
UNSAFE_componentWillMount() {
const { config } = this.props
+ let _setting = fromJS(config.setting).toJS()
+ if (_setting.interType === 'inner' && !_setting.innerFunc) {
+ _setting.interType = 'system'
+ }
+
this.setState({
+ setting: _setting,
columns: fromJS(config.columns).toJS(),
- setting: fromJS(config.setting).toJS(),
scripts: fromJS(config.scripts).toJS()
})
@@ -414,14 +419,16 @@
sqlverify = (resolve, reject, change = false, testScripts) => {
const { searches } = this.props
- const { columns, setting, scripts } = this.state
-
- let _scripts = scripts.filter(item => item.status !== 'false')
+ const { columns, setting, scripts, activeKey } = this.state
+ let _scripts = []
if (testScripts) {
_scripts = testScripts.filter(item => item.status !== 'false')
+ } else {
+ _scripts = scripts.filter(item => item.status !== 'false')
}
- if (!change && setting.interType === 'inner' && !setting.innerFunc && setting.execute === 'false' && _scripts.length === 0) {
+
+ if (!change && setting.interType === 'system' && !setting.innerFunc && setting.execute === 'false' && _scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
@@ -431,7 +438,12 @@
return
}
- if ((setting.interType === 'inner' && !setting.innerFunc && setting.execute !== 'false') || _scripts.length > 0) {
+ // 涓嶄娇鐢ㄩ粯璁ql鍒囨崲
+ if (change && activeKey === 'setting' && setting.interType === 'system' && setting.execute === 'false') {
+ resolve()
+ } else if (change && activeKey === 'scripts' && _scripts.length === 0) {
+ resolve()
+ } else if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let param = {
func: 's_debug_sql',
LText: SettingUtils.getDebugSql(setting, _scripts, columns, searches)
--
Gitblit v1.8.0