From 3b43ee5ead5f625d532150afceddcf1b481b823d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 29 五月 2020 00:09:36 +0800
Subject: [PATCH] 2020-05-29
---
src/tabviews/commontable/index.jsx | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index c0c04a8..fd4843d 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -733,17 +733,20 @@
})
}
- if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ if (setting.queryType === 'statistics' && setting.default !== 'false') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
regoptions.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`
- let DateCount = `select count(1) as total from ${_dataresource} ${_search}`
+ let LText = ''
+ let DateCount = ''
- if (setting.laypage === 'false') {
+ if (setting.default !== 'false' && setting.laypage !== 'false') {
+ 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`
+ DateCount = `select count(1) as total from ${_dataresource} ${_search}`
+ } else if (setting.default !== 'false') {
LText = `select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${_orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
DateCount = ''
}
@@ -767,6 +770,20 @@
param.custom_script = param.custom_script.replace(item.reg, item.value)
})
+ if (LText) {
+ LText += `
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ `
+ } else {
+ param.custom_script += `
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ `
+ }
+
param.custom_script = Utils.formatOptions(param.custom_script)
}
--
Gitblit v1.8.0