From 5354b648a9765d8c9ca3f8c7ce065b58c3d55716 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 18:47:36 +0800
Subject: [PATCH] 2022-10-10
---
src/utils/utils-datamanage.js | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 2e4dedc..26da2ab 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -99,9 +99,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') || ''
@@ -196,6 +196,9 @@
regoptions.forEach(item => {
_customScript = _customScript.replace(item.reg, item.value)
})
+ if (window.GLOB.breakpoint) {
+ _customScript = _customScript.replace(/\$breakpoint_proc@/ig, window.GLOB.breakpoint)
+ }
}
let LText = ''
@@ -295,9 +298,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 = ''
@@ -792,7 +795,7 @@
foreign_key: '',
sql: _dataresource,
script: _customScript,
- transaction: setting.transaction === 'true'
+ // transaction: setting.transaction === 'true'
}
}
@@ -803,7 +806,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 +818,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 +854,9 @@
BID: BID
}
- if (transaction) {
- param.func = 'sPC_Get_structured_data_try'
- }
+ // if (transaction) {
+ // param.func = 'sPC_Get_structured_data_try'
+ // }
let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
--
Gitblit v1.8.0