From 8a0b3081ecacbb844ea639ccc53ffd2c151cec1e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 三月 2021 02:13:53 +0800
Subject: [PATCH] 2021-03-28
---
src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
index d690943..d9f30b2 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} columns 鏄剧ず瀛楁
*/
- static getDebugSql (setting, scripts, columns, searches, calendar) {
+ static getDebugSql (setting, scripts, columns, searches, calendar, urlFields = []) {
let sql = ''
let _dataresource = ''
let _customScript = ''
@@ -28,21 +28,22 @@
}
if (setting.execute !== 'false') {
- _dataresource = setting.dataresource
+ _dataresource = setting.dataresource || ''
}
- if (_dataresource) {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- }
- if (_customScript) {
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- }
+ _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
}
+
+ urlFields.forEach(field => {
+ _dataresource = _dataresource.replace(new RegExp('@' + field + '@', 'ig'), '0')
+ _customScript = _customScript.replace(new RegExp('@' + field + '@', 'ig'), '0')
+ })
// 姝ｅ垯鏇挎崲
let _regoptions = []
@@ -62,13 +63,20 @@
_regoptions.push({
reg: new RegExp('@calendarDate@', 'ig'),
value: `'1970-01-01 00:00:00.000'`
- })
- _regoptions.push({
+ }, {
reg: new RegExp('@calendarDate1@', 'ig'),
value: `'2030-12-31 23:59:59.999'`
})
}
+ _regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: `''`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `''`
+ })
+
if ((setting.queryType === 'statistics' || calendar.refresh === 'true') && _dataresource) {
_regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
--
Gitblit v1.8.0