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/tabviews/calendar/index.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index f9c7c92..0689eea 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -329,7 +329,7 @@
}
let _dataresource = setting.dataresource
- let regoptions = null
+ let regoptions = []
if (setting.queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
let userName = sessionStorage.getItem('User_Name') || ''
@@ -355,18 +355,18 @@
})
}
- if (config.calendar.refresh === 'true' && regoptions) {
+ if (config.calendar.refresh === 'true') {
regoptions.push({
reg: new RegExp('@calendarDate@', 'ig'),
- value: `${calendarYear}-01-01 00:00:00.000`
+ value: `'${calendarYear}-01-01 00:00:00.000'`
})
regoptions.push({
reg: new RegExp('@calendarDate1@', 'ig'),
- value: `${calendarYear}-12-31 23:59:59.999`
+ value: `'${calendarYear}-12-31 23:59:59.999'`
})
}
- if (setting.queryType === 'statistics' && setting.execute !== 'false') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ if ((setting.queryType === 'statistics' || config.calendar.refresh === 'true') && setting.execute !== 'false') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
--
Gitblit v1.8.0