From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/utils/utils-datamanage.js | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 5163438..b085f16 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -64,10 +64,26 @@
param.rduri = setting.interface
}
} else {
- if (setting.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- } else if (setting.sysInterface !== 'true') {
- param.rduri = window.GLOB.systemType === 'production' ? (setting.proInterface || setting.interface) : setting.interface
+ 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 {
+ param.rduri = setting.interface
+ }
+ let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+ if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+ param.$login = true
+ }
}
}
@@ -91,9 +107,9 @@
default_sql: setting.execute ? 'true' : 'false'
}
- if (setting.transaction === 'true') {
- param.func = 'sPC_Get_TableData_try'
- }
+ // if (setting.transaction === 'true') {
+ // param.func = 'sPC_Get_TableData_try'
+ // }
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -188,18 +204,22 @@
regoptions.forEach(item => {
_customScript = _customScript.replace(item.reg, item.value)
})
+ if (window.GLOB.breakpoint) {
+ _customScript = _customScript.replace(/\$breakpoint_proc@/ig, window.GLOB.breakpoint)
+ param.func = 'sPC_Get_TableData_debug'
+ }
}
let LText = ''
let DateCount = ''
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 `
+ 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) {
@@ -261,6 +281,10 @@
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)
@@ -287,9 +311,9 @@
default_sql: setting.execute ? 'true' : 'false'
}
- if (setting.transaction === 'true') {
- param.func = 'sPC_Get_TableData_try'
- }
+ // if (setting.transaction === 'true') {
+ // param.func = 'sPC_Get_TableData_try'
+ // }
let _dataresource = setting.dataresource
let _customScript = ''
@@ -377,7 +401,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}
@@ -438,7 +462,6 @@
*/
static getPrevQueryParams (setting, search = [], BID) {
let param = null
-
if (setting.procMode !== 'inner') {
param = this.getDefaultPrevQueryParam(setting, search, BID)
} else {
@@ -533,7 +556,9 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
- param.menuname = setting.MenuName || ''
+ if (setting.$name) {
+ param.menuname = setting.$name
+ }
return param
}
@@ -616,7 +641,10 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
param.LText = Utils.formatOptions(param.LText)
- param.menuname = setting.MenuName || ''
+
+ if (setting.$name) {
+ param.menuname = setting.$name
+ }
if (BID) {
param.BID = BID
@@ -780,7 +808,7 @@
foreign_key: '',
sql: _dataresource,
script: _customScript,
- transaction: setting.transaction === 'true'
+ // transaction: setting.transaction === 'true'
}
}
@@ -791,7 +819,7 @@
export function getStructuredParams (params, config, BID) {
let LText_field = []
let diffUser = false
- let transaction = false
+ // let transaction = false
let loginId = `'${sessionStorage.getItem('LoginUID') || ''}'`
let sessionId = `'${localStorage.getItem('SessionUid') || ''}'`
let userId = `'${sessionStorage.getItem('UserID') || ''}'`
@@ -803,9 +831,9 @@
if (!diffUser && (/@userid@/ig.test(item.sql) || /@userid@/ig.test(_script))) {
diffUser = true
}
- if (item.transaction) {
- transaction = true
- }
+ // if (item.transaction) {
+ // transaction = true
+ // }
_sql = _sql.replace(/@ID@/ig, `''`)
_script = _script.replace(/@ID@/ig, `''`)
@@ -839,9 +867,12 @@
BID: BID
}
- if (transaction) {
- param.func = 'sPC_Get_structured_data_try'
+ if (config.MenuName) {
+ param.menuname = config.MenuName
}
+ // if (transaction) {
+ // param.func = 'sPC_Get_structured_data_try'
+ // }
let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
--
Gitblit v1.8.0