From 53a6a5761ecffcfe459928ef3b60f9b114fcd27f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 17:31:48 +0800
Subject: [PATCH] 2023-08-27
---
src/utils/utils.js | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6965ff7..7186361 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1016,27 +1016,30 @@
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
- let tb = new RegExp('(^|\\s)@' + sheet + '(\\s|$|(|))', 'ig')
+ let isDM = sessionStorage.getItem('dataM') === 'true'
+ let regs = [
+ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: `#${sheet} `},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: `#${sheet}(`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: `#${sheet})`},
+ {reg: /@BID@/ig, value: `'${BID}'`},
+ {reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+ {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+ {reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+ {reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@typename@/ig, value: `'admin'`},
+ {reg: /\$@/ig, value: isDM ? '/*' : ''},
+ {reg: /@\$/ig, value: isDM ? '*/' : ''},
+ {reg: /@datam@/ig, value: isDM ? `'Y'` : `''`},
+ ]
btn.scripts && btn.scripts.forEach(script => {
if (script.status === 'false') return
let _sql = script.sql
- _sql = _sql.replace(tb, `#${sheet}`)
- _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 (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
- } else {
- _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
- }
+ regs.forEach(item => {
+ _sql = _sql.replace(item.reg, item.value)
+ })
if (script.position === 'init') {
_initCustomScript += `
@@ -1219,26 +1222,30 @@
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
- let tb = new RegExp('(^|\\s)@' + sheet + '(\\s|$|(|))', 'ig')
+ let isDM = sessionStorage.getItem('dataM') === 'true'
+ let regs = [
+ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: `#${sheet} `},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: `#${sheet}(`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: `#${sheet})`},
+ {reg: /@BID@/ig, value: `'${BID}'`},
+ {reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+ {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+ {reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+ {reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@typename@/ig, value: `'admin'`},
+ {reg: /\$@/ig, value: isDM ? '/*' : ''},
+ {reg: /@\$/ig, value: isDM ? '*/' : ''},
+ {reg: /@datam@/ig, value: isDM ? `'Y'` : `''`},
+ ]
btn.scripts && btn.scripts.forEach(script => {
if (script.status === 'false') return
let _sql = script.sql
- _sql = _sql.replace(tb, `#${sheet}`)
- _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 (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
- } else {
- _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
- }
+ regs.forEach(item => {
+ _sql = _sql.replace(item.reg, item.value)
+ })
if (script.position === 'init') {
_initCustomScript += `
--
Gitblit v1.8.0