From 9a1416e0b5cdb40f49b3c2061b04b35551d77e99 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 九月 2023 18:14:21 +0800
Subject: [PATCH] 2023-09-19
---
src/templates/zshare/customscript/index.jsx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/templates/zshare/customscript/index.jsx b/src/templates/zshare/customscript/index.jsx
index 662e012..3791423 100644
--- a/src/templates/zshare/customscript/index.jsx
+++ b/src/templates/zshare/customscript/index.jsx
@@ -94,18 +94,23 @@
let _usefulFields = []
searches.forEach(item => {
- if (!item.field) return
- if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
- } else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
- } else if (_usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
+ if (['dateweek', 'datemonth'].includes(item.type)) {
+ _usefulFields.push(item.key)
+ _usefulFields.push(item.key + '1')
+ } else if (item.type === 'daterange') {
+ let _skey = item.key
+ let _ekey = item.key + '1'
+
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
+ }
+ _usefulFields.push(_skey)
+ _usefulFields.push(_ekey)
+ } else if (item.type === 'date' && _usefulFields.includes(item.key)) {
+ _usefulFields.push(item.key + '1')
} else {
- _usefulFields.push(item.field.replace(/,/ig, ', '))
+ _usefulFields.push(item.key.replace(/,/ig, ', '))
}
})
--
Gitblit v1.8.0