From ea9cdac78107c68b94d24a0055bce461d0fd1ae2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 11 五月 2023 10:41:36 +0800
Subject: [PATCH] 2023-05-11
---
src/utils/utils-datamanage.js | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index d4780ee..c081694 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -64,9 +64,17 @@
param.rduri = setting.interface
}
} else {
- if (setting.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- } else if (setting.sysInterface !== 'true') {
+ if (setting.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (setting.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ param.$token = setting.exProInterface || ''
+ } else {
+ param.$token = setting.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && setting.proInterface) {
param.rduri = setting.proInterface
} else {
@@ -137,8 +145,8 @@
_customScript = _customScript.replace(/\$sum@/ig, '/*')
_customScript = _customScript.replace(/@sum\$/ig, '*/')
- _dataresource = _dataresource.replace(/@ID@/ig, `''`)
- _customScript = _customScript.replace(/@ID@/ig, `''`)
+ // _dataresource = _dataresource.replace(/@ID@/ig, `''`)
+ // _customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
_customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
_dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
@@ -149,6 +157,8 @@
_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(/@typename@/ig, `'admin'`)
+ _customScript = _customScript.replace(/@typename@/ig, `'admin'`)
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
@@ -205,13 +215,21 @@
let LText = ''
let DateCount = ''
+ if (setting.sub_field) {
+ arrFields = arrFields + ',' + setting.sub_field
+ }
+
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}`
+ LText = `/*system_query*/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 `
+ if (setting.sub_field) {
+ DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
+ } else {
+ DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
+ }
} else if (_dataresource && orderBy) {
- LText = ` select ${arrFields} from (select ${arrFields} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
+ LText = `/*system_query*/select ${arrFields} from (select ${arrFields} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
} else if (_dataresource) {
- LText = ` select ${arrFields} from ${_dataresource} ${_search} `
+ LText = `/*system_query*/select ${arrFields} from ${_dataresource} ${_search} `
}
if (_customScript) {
@@ -268,10 +286,21 @@
// param.sub_name = 'sub_data'
// param.sub_field = 'BID,friend_text,icon,Initials'
+ if (setting.sub_field) {
+ param.sub_name = setting.subdata
+ param.tabid = setting.primaryKey || ''
+ param.parid = setting.subBID || ''
+ param.sub_field = setting.sub_field
+ }
+
// exec_type: 'y' 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ if (window.GLOB.probation) {
+ param.s_debug_type = 'Y'
+ }
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -336,8 +365,8 @@
_customScript = _customScript.replace(/\$select@/ig, '/*')
_customScript = _customScript.replace(/@select\$/ig, '*/')
- _dataresource = _dataresource.replace(/@ID@/ig, `''`)
- _customScript = _customScript.replace(/@ID@/ig, `''`)
+ // _dataresource = _dataresource.replace(/@ID@/ig, `''`)
+ // _customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
_customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
_dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
@@ -348,6 +377,8 @@
_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(/@typename@/ig, `'admin'`)
+ _customScript = _customScript.replace(/@typename@/ig, `'admin'`)
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
@@ -389,7 +420,7 @@
})
}
- let LText = ` select ${statFields.map(col => `isnull(sum(${col.field}),0) as ${col.field}`).join(',')} from ${_dataresource} ${_search} `
+ let LText = ` /*system_query*/select ${statFields.map(col => `isnull(sum(${col.field}),0) as ${col.field}`).join(',')} from ${_dataresource} ${_search} `
if (_customScript) {
LText = `${LText}
@@ -529,6 +560,7 @@
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(/@typename@/ig, `'admin'`)
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
@@ -619,6 +651,7 @@
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(/@typename@/ig, `'admin'`)
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
@@ -721,7 +754,7 @@
* @description 鐢熸垚鍗曚釜缁勪欢sPC_Get_structured_data璇锋眰鍙傛暟
*/
export function getStructDefaultParam (component, searchlist, first) {
- const { columns, setting, dataName, format } = component
+ const { columns, setting, dataName, format, uuid } = component
let arr_field = columns.map(col => col.field)
let _dataresource = setting.dataresource
@@ -787,6 +820,7 @@
}
return {
+ uuid: uuid,
name: dataName,
$name: setting.$name,
columns: columns,
@@ -835,6 +869,8 @@
_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(/@typename@/ig, `'admin'`)
+ _script = _script.replace(/@typename@/ig, `'admin'`)
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
@@ -855,6 +891,9 @@
BID: BID
}
+ if (config.MenuName) {
+ param.menuname = config.MenuName
+ }
// if (transaction) {
// param.func = 'sPC_Get_structured_data_try'
// }
--
Gitblit v1.8.0