From 6def3330d1d1cf4036916ed04c8bbc4128e1e5d0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 03 五月 2020 19:42:17 +0800
Subject: [PATCH] 2020-05-03
---
src/tabviews/subtabtable/index.jsx | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index b096258..912166b 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -430,23 +430,14 @@
}
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
- let fieldmap = new Map()
- let options = search.map(item => {
- let _field = item.key
+ let allSearch = Utils.getAllSearchOptions(search)
- if (fieldmap.has(_field)) {
- _field = _field + '1'
- }
-
- fieldmap.set(item.key, true)
-
+ let options = allSearch.map(item => {
return {
- reg: new RegExp('@' + _field + '@', 'ig'),
+ reg: new RegExp('@' + item.key + '@', 'ig'),
value: item.value
}
})
-
- // options.reverse()
options.forEach(item => {
_dataresource = _dataresource.replace(item.reg, `'${item.value}'`)
--
Gitblit v1.8.0