From e47f5f999cb20283ad99c00c5e771d44501cf3c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十二月 2019 17:47:26 +0800
Subject: [PATCH] 2019-12-26
---
src/tabviews/commontable/index.jsx | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index e4ed65e..445c4d8 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -310,18 +310,24 @@
const { arr_field, pageIndex, pageSize, orderColumn, orderType, search, setting } = this.state
let _search = Utils.joinMainSearchkey(search)
- _search = _search ? 'where ' + _search : ''
+ _search = _search ? 'where ' + _search : ''
+
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field
}
-
+
let orderBy = orderColumn ? (orderColumn + ' ' + orderType) : setting.order
+ let _dataresource = setting.dataresource
- let LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${setting.dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows`
- let DateCount = `select count(1) as total from ${setting.dataresource} ${_search}`
+ if (/\s/.test(_dataresource)) {
+ _dataresource = '(' + _dataresource + ') tb'
+ }
+
+ 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`
+ let DateCount = `select count(1) as total from ${_dataresource} ${_search}`
console.log(LText)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
@@ -459,8 +465,13 @@
}
let orderBy = orderColumn ? (orderColumn + ' ' + orderType) : setting.order
+ let _dataresource = setting.dataresource
- let LText = `select ${_arr_label_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${setting.dataresource} ${_search}) tmptable order by tmptable.rows`
+ if (/\s/.test(_dataresource)) {
+ _dataresource = '(' + _dataresource + ') tb'
+ }
+
+ let LText = `select ${_arr_label_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
console.log(LText)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
--
Gitblit v1.8.0