From f22bb55c4ff50a8a63c795487b057c0cebdae649 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 十二月 2019 09:19:58 +0800
Subject: [PATCH] 2019-12-12
---
src/tabviews/commontable/index.jsx | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 41ca634..31a4806 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -127,7 +127,7 @@
columns: _columns,
arr_field: _arrField.join(','),
search: _search ? 'where (' + _search + ')' : '',
- orderColumn: config.setting.orderColumn,
+ // orderColumn: config.setting.orderColumn,
loading: true
}, () => {
this.improveSearch()
@@ -255,16 +255,19 @@
async loadmaindata () {
const { arr_field, pageIndex, pageSize, orderColumn, orderType, search, setting } = this.state
+ console.log(setting)
// 鑾峰彇鍒楄〃鏁版嵁
let param = {
- func: 'sPC_Get_TableData',
+ func: setting.innerFunc || 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field
}
- let LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderColumn} ${orderType}) 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}`
+ let orderBy = orderColumn ? (orderColumn + ' ' + orderType) : setting.order
+ 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}`
+ console.log(LText)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -359,6 +362,8 @@
UNSAFE_componentWillMount () {
// 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
this.loadconfig()
+
+ console.log(Utils.getfunc())
}
shouldComponentUpdate (nextProps, nextState) {
--
Gitblit v1.8.0