From 4f8ffec8fc4aa9918264a3b3b4952421d896f5eb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 四月 2020 17:48:36 +0800
Subject: [PATCH] 2020-04-17
---
src/templates/zshare/verifycardexcelin/customscript/index.jsx | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/templates/zshare/verifycardexcelin/customscript/index.jsx b/src/templates/zshare/verifycardexcelin/customscript/index.jsx
index 8c4d235..ba33bfe 100644
--- a/src/templates/zshare/verifycardexcelin/customscript/index.jsx
+++ b/src/templates/zshare/verifycardexcelin/customscript/index.jsx
@@ -105,21 +105,21 @@
notification.warning({
top: 92,
message: 'sql涓璡'蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (_lparen !== _rparen) {
notification.warning({
top: 92,
message: 'sql涓�()蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (/--/ig.test(values.sql)) {
notification.warning({
top: 92,
message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇瀛楃 -- 锛屾敞閲婅鐢� /*鍐呭*/',
- duration: 10
+ duration: 5
})
return
}
@@ -130,7 +130,7 @@
notification.warning({
top: 92,
message: 'sql涓笉鍙娇鐢�' + error,
- duration: 10
+ duration: 5
})
return
}
@@ -139,9 +139,19 @@
aaa:
`
+ let _initsql = ''
+ this.props.scripts.forEach(script => {
+ if (this.state.editItem && this.state.editItem.uuid === script.uuid) return
+ if (script.status === 'false' || script.position !== 'init') return
+
+ _initsql += `
+ ${script.sql}
+ `
+ })
+
let param = {
func: 's_debug_sql',
- LText: this.state.verifySql + values.sql + tail
+ LText: this.state.verifySql + _initsql + values.sql + tail
}
param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
--
Gitblit v1.8.0