From b3852c89968e9d5d6a3b9a4998d869bfbbfd1842 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 01 十二月 2020 18:19:04 +0800
Subject: [PATCH] 2020-12-01
---
src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
index af0e089..3c4d069 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) {
+ static getDebugSql (setting, scripts, columns, searches, calendar) {
let sql = ''
let _dataresource = ''
let _customScript = ''
@@ -39,27 +39,31 @@
}
// 姝ｅ垯鏇挎崲
- let _regoptions = searches.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
+ let _regoptions = []
let _search = ''
- // 鏃ュ巻涓殑骞翠唤鏇挎崲
if (setting.queryType === 'statistics' || _customScript) {
- _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 = searches.map(item => {
+ return {
+ reg: new RegExp('@' + item.key + '@', 'ig'),
+ value: `'0'`
+ }
})
}
- if (setting.queryType === 'statistics' && _dataresource) {
+ // 鏃ュ巻涓殑骞翠唤鏇挎崲
+ if (calendar.refresh === 'true') {
+ _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'`
+ })
+ }
+
+ if ((setting.queryType === 'statistics' || calendar.refresh === 'true') && _dataresource) {
_regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
--
Gitblit v1.8.0