From e739b47d88c14c2d83ad400d74241f9396e5d7cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 14:35:37 +0800
Subject: [PATCH] 2020-12-03
---
src/utils/utils-datamanage.js | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index d214736..0022c68 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -16,13 +16,13 @@
* @param {Boolean} dataManager 鏁版嵁鏉冮檺
* @return {Object} param
*/
- static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, menuType, dataManager) {
+ static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, menuType, dataManager, id) {
let param = null
if (setting.interType === 'system' || (setting.interType === 'inner' && !setting.innerFunc)) {
- param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, menuType)
+ param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, menuType, id)
} else {
- param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, menuType)
+ param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, menuType, id)
}
if (BID) {
@@ -39,14 +39,16 @@
/**
* @description 鑾峰彇鐢ㄦ埛鑷畾涔夊瓨鍌ㄨ繃绋嬩紶鍙�
*/
- static getCustomQueryParam (setting, search, orderBy, pageIndex, pageSize, menuType) {
+ static getCustomQueryParam (setting, search, orderBy, pageIndex, pageSize, menuType, id) {
let param = Utils.formatCustomMainSearch(search)
if (orderBy) {
param.OrderCol = orderBy
}
- if (setting.laypage) {
+ if (id) {
+ param.ID = id
+ } else if (setting.laypage) {
param.PageIndex = pageIndex
param.PageSize = pageSize
}
@@ -79,7 +81,7 @@
/**
* @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁�
*/
- static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, menuType) {
+ static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, menuType, id) {
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -137,11 +139,14 @@
regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
- } else if (_dataresource) {
+ } else if (_dataresource && !id) {
_search = Utils.joinMainSearchkey(search)
if (_search) {
_search = 'where ' + _search
}
+ } else if (_dataresource && id) {
+ _search = Utils.joinMainSearchkey(search)
+ _search = `where ${_search ? _search + ' AND ' : ''} ${setting.primaryKey || 'ID'}='${id}'`
}
if (_customScript) {
@@ -153,7 +158,7 @@
let LText = ''
let DateCount = ''
- if (_dataresource && setting.laypage && orderBy) {
+ if (_dataresource && setting.laypage && orderBy && !id) {
LText = ` select top ${pageSize} ${arrFields} from (select ${arrFields} ,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 (_dataresource && orderBy) {
@@ -180,8 +185,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.log(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.log(LText)
+ _customScript && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && console.info(LText)
}
param.custom_script = Utils.formatOptions(_customScript)
@@ -281,8 +286,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.log(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.log(LText)
+ _customScript && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && console.info(LText)
}
param.custom_script = Utils.formatOptions(_customScript)
--
Gitblit v1.8.0