From 8137ac074ce6370e4b46295e7acf9c7870ef82d2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 二月 2023 22:19:23 +0800
Subject: [PATCH] 2023-02-17
---
src/utils/utils-datamanage.js | 79 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 2e4dedc..59bca43 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 {
@@ -99,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') || ''
@@ -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') || ''}'`)
@@ -196,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) {
@@ -264,10 +276,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)
@@ -295,9 +318,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 = ''
@@ -332,8 +355,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') || ''}'`)
@@ -385,7 +408,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}
@@ -717,7 +740,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
@@ -783,6 +806,7 @@
}
return {
+ uuid: uuid,
name: dataName,
$name: setting.$name,
columns: columns,
@@ -792,7 +816,7 @@
foreign_key: '',
sql: _dataresource,
script: _customScript,
- transaction: setting.transaction === 'true'
+ // transaction: setting.transaction === 'true'
}
}
@@ -803,7 +827,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') || ''}'`
@@ -815,9 +839,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, `''`)
@@ -851,9 +875,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