From daf28271b384adce6b19b6543dae69e84b26295c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 18:30:59 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils.js | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index bd64787..35d083e 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -932,14 +932,6 @@
let _sql = script.sql
- _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
- _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
- _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
- _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 (script.position === 'init') {
_initCustomScript += `
/* 鑷畾涔夎剼鏈� */
@@ -1144,6 +1136,30 @@
Delete @${sheet}
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _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'`)
+
+ _sqlBottom = _sqlBottom.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+ _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
@@ -1358,6 +1374,28 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _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'`)
+
+ _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+ _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
--
Gitblit v1.8.0