From b35e3f0bacdbadf5823e06fe8dc6e047089aae38 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 一月 2020 00:25:45 +0800
Subject: [PATCH] 2020-01-19
---
src/tabviews/commontable/index.jsx | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 14b1a3a..b76243f 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -182,12 +182,14 @@
columns: _columns,
isLinkMain: _isLinkMain,
arr_field: _arrField.join(','),
- search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
- loading: true
+ search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
}, () => {
this.improveSearch()
if (config.setting.onload !== 'false') { // 鍒濆鍖栧彲鍔犺浇
+ this.setState({
+ loading: true
+ })
this.loadmaindata()
}
})
@@ -406,6 +408,22 @@
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
+ }
+
+ if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ let fieldmap = new Map()
+ search.forEach(item => {
+ let _field = item.key
+
+ if (fieldmap.has(_field)) {
+ _field = _field + '1'
+ }
+
+ fieldmap.set(item.key, true)
+
+ let reg = new RegExp('@' + _field, 'ig')
+ _dataresource = _dataresource.replace(reg, `'${item.value}'`)
+ })
}
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`
@@ -661,7 +679,6 @@
* @description 瑙﹀彂鎸夐挳寮圭獥锛堟爣绛鹃〉锛�
*/
triggerPopview = (btn, data) => {
- console.log(btn)
if (btn.OpenType === 'popview') {
this.setState({
popAction: btn,
--
Gitblit v1.8.0