From 704f82b06befe96e5f739b2dce419f76f5683a6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 八月 2022 09:27:54 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-datamanage.js | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 954937d..0b94159 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -13,16 +13,15 @@
* @param {Number} pageIndex 椤电爜
* @param {Number} pageSize 姣忛〉鏁伴噺
* @param {String} BID 涓婄骇ID
- * @param {String} menuType 鑿滃崟绫诲瀷锛屾櫘閫氳彍鍗曚笌HS
* @return {Object} param
*/
- static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, menuType, id) {
+ static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id) {
let param = null
if (setting.interType === 'system' || (setting.interType === 'custom' && setting.requestMode === 'system')) {
- param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, menuType, id, BID)
+ param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, id, BID)
} else {
- param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, menuType, id)
+ param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, id)
}
if (BID) {
@@ -39,7 +38,7 @@
/**
* @description 鑾峰彇鐢ㄦ埛鑷畾涔夊瓨鍌ㄨ繃绋嬩紶鍙�
*/
- static getCustomQueryParam (setting, search, orderBy, pageIndex, pageSize, menuType, id) {
+ static getCustomQueryParam (setting, search, orderBy, pageIndex, pageSize, id) {
let param = Utils.formatCustomMainSearch(search)
if (orderBy) {
@@ -56,7 +55,7 @@
if (setting.interType === 'inner' || (setting.interType === 'custom' && setting.requestMode === 'inner')) {
param.func = setting.innerFunc
} else {
- if (menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (setting.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (setting.sysInterface !== 'true') {
@@ -79,9 +78,9 @@
}
/**
- * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁�
+ * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼鐨勫弬鏁�
*/
- static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, menuType, id, BID) {
+ static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, id, BID) {
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -128,7 +127,6 @@
_customScript = _customScript.replace(/\$sum@/ig, '/*')
_customScript = _customScript.replace(/@sum\$/ig, '*/')
- let time_id = Utils.getguid().substring(0, 32) || ''
_dataresource = _dataresource.replace(/@ID@/ig, `''`)
_customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
@@ -141,8 +139,6 @@
_customScript = _customScript.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_dataresource = _dataresource.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_customScript = _customScript.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- _dataresource = _dataresource.replace(/@time_id@/ig, `'${time_id}'`)
- _customScript = _customScript.replace(/@time_id@/ig, `'${time_id}'`)
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
@@ -263,7 +259,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -271,9 +267,9 @@
}
/**
- * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鍚堣鍊肩殑鍙傛暟
+ * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼鍚堣鍊肩殑鍙傛暟
*/
- static getStatQueryDataParams (setting, statFields, search, orderBy, BID, menuType) {
+ static getStatQueryDataParams (setting, statFields, search, orderBy, BID) {
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -319,7 +315,6 @@
_customScript = _customScript.replace(/\$select@/ig, '/*')
_customScript = _customScript.replace(/@select\$/ig, '*/')
- let time_id = Utils.getguid().substring(0, 32) || ''
_dataresource = _dataresource.replace(/@ID@/ig, `''`)
_customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
@@ -332,8 +327,6 @@
_customScript = _customScript.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_dataresource = _dataresource.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_customScript = _customScript.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- _dataresource = _dataresource.replace(/@time_id@/ig, `'${time_id}'`)
- _customScript = _customScript.replace(/@time_id@/ig, `'${time_id}'`)
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
@@ -407,7 +400,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -432,14 +425,13 @@
* @param {Number} pageIndex 椤电爜
* @param {Number} pageSize 姣忛〉鏁伴噺
* @param {String} BID 涓婄骇ID
- * @param {String} menuType 鑿滃崟绫诲瀷锛屾櫘閫氳彍鍗曚笌HS
* @return {Object} param
*/
- static getPrevQueryParams (setting, search = [], BID, menuType) {
+ static getPrevQueryParams (setting, search = [], BID) {
let param = null
if (setting.procMode !== 'inner') {
- param = this.getDefaultPrevQueryParam(setting, search, menuType, BID)
+ param = this.getDefaultPrevQueryParam(setting, search, BID)
} else {
param = Utils.formatCustomMainSearch(search)
param.func = setting.prevFunc || ''
@@ -455,7 +447,7 @@
/**
* @description 鑾峰彇绯荤粺鍓嶇疆鑴氭湰
*/
- static getDefaultPrevQueryParam (setting, search, menuType, BID) {
+ static getDefaultPrevQueryParam (setting, search, BID) {
let param = {
func: 'sPC_TableData_InUpDe',
exec_type: 'y',
@@ -517,7 +509,6 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- sql = sql.replace(/@time_id@/ig, `'${Utils.getguid().substring(0, 32) || ''}'`)
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
@@ -529,7 +520,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- if (menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
+ if (window.GLOB.mkHS) { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -606,7 +597,6 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- sql = sql.replace(/@time_id@/ig, `'${Utils.getguid().substring(0, 32) || ''}'`)
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
@@ -618,6 +608,14 @@
param.secretkey = Utils.encrypt('', param.timestamp)
param.LText = Utils.formatOptions(param.LText)
param.menuname = setting.MenuName || ''
+
+ if (BID) {
+ param.BID = BID
+ }
+
+ if (window.GLOB.mkHS) { // 绯荤粺鍑芥暟浜戠楠岃瘉
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+ }
return param
}
@@ -763,14 +761,9 @@
`
}
- // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- _dataresource && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _dataresource)
- }
-
return {
name: dataName,
+ $name: setting.$name,
columns: columns,
par_tablename: '',
type: format === 'array' ? format : '',
@@ -790,7 +783,6 @@
let LText_field = []
let diffUser = false
let transaction = false
- let time_id = Utils.getguid().substring(0, 32) || ''
let loginId = `'${sessionStorage.getItem('LoginUID') || ''}'`
let sessionId = `'${localStorage.getItem('SessionUid') || ''}'`
let userId = `'${sessionStorage.getItem('UserID') || ''}'`
@@ -818,8 +810,12 @@
_script = _script.replace(/@UserID@/ig, userId)
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_script = _script.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- _sql = _sql.replace(/@time_id@/ig, `'${time_id}'`)
- _script = _script.replace(/@time_id@/ig, `'${time_id}'`)
+
+ // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ _script && console.info(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
+ _sql && console.info(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
+ }
item.columns.forEach(cell => {
LText_field.push(`Select '${item.name}' as tablename,'${cell.field}' as fieldname,'${cell.datatype}' as field_type`)
--
Gitblit v1.8.0