From 3e168c2a5149f1a56e41cacf4eda95d10b497210 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:17:01 +0800
Subject: [PATCH] 2023-08-29

---
 src/utils/utils.js |   33 +++++++--------------------------
 1 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7186361..77e646d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -39,26 +39,6 @@
 
 export default class Utils {
   /**
-   * @description 鑾峰彇浼氬憳绛夌骇
-   * @return {String}  level
-   */
-  static getMemberLevel () {
-    let _level = 10
-    let _Mlevel = sessionStorage.getItem('Member_Level')
-
-    if (_Mlevel) {
-      if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
-        _level = 10
-      } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
-        _level = 20
-      } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
-        _level = 30
-      }
-    }
-    return _level
-  }
-
-  /**
    * @description 鑾峰彇鍥捐〃楂樺害
    */
   static getHeight (val) {
@@ -1018,9 +998,10 @@
     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') || ''}'`},
       {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
@@ -1224,9 +1205,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