From eb31b84962c192de57abbb473cb4733a09bf4363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 五月 2020 18:09:40 +0800
Subject: [PATCH] 2020-05-14
---
src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
index cffe183..2924724 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
@@ -27,15 +27,22 @@
UNSAFE_componentWillMount() {
const { searches } = this.props
- let _usefulFields = searches.map(item => {
+
+ let _usefulFields = []
+ searches.forEach(item => {
if (item.type === 'group') {
if (item.transfer === 'true') {
- return item.field + ', ' + item.datefield
- } else {
- return item.datefield
+ _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')
} else {
- return item.field
+ _usefulFields.push(item.field)
}
})
@@ -124,6 +131,8 @@
LText: _initsql + values.sql + tail
}
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+
let allSearch = Utils.initMainSearch(searches)
allSearch = Utils.getAllSearchOptions(allSearch)
--
Gitblit v1.8.0