From daf42d3c347be272b436f08ff25dfa37f0952852 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 一月 2020 11:36:56 +0800
Subject: [PATCH] 2020-01-19
---
src/tabviews/subtabtable/index.jsx | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index cb71290..20c3383 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -335,7 +335,7 @@
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
let fieldmap = new Map()
- search.forEach(item => {
+ let options = search.map(item => {
let _field = item.key
if (fieldmap.has(_field)) {
@@ -344,9 +344,19 @@
fieldmap.set(item.key, true)
- let reg = new RegExp('@' + _field, 'ig')
- _dataresource = _dataresource.replace(reg, `'${item.value}'`)
+ return {
+ reg: new RegExp('@' + _field, 'ig'),
+ value: item.value
+ }
})
+
+ options.reverse()
+
+ options.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, `'${item.value}'`)
+ })
+
+ _search = ''
}
let LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows`
--
Gitblit v1.8.0