From 06233af15968111c5d436ea30ad24e80bd9ca7bc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 22:34:49 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/utils/utils.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4633e68..c216d77 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1018,9 +1018,9 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
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: 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: /@ID@/ig, value: `'${primaryId || ''}'`},
{reg: /@BID@/ig, value: `'${BID}'`},
{reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
@@ -1225,9 +1225,9 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
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: 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') || ''}'`},
--
Gitblit v1.8.0