From 69d182c8cee63fb850a001b0edf4b613e8aa01c2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 02 四月 2021 17:58:35 +0800
Subject: [PATCH] 2021-04-02

---
 src/tabviews/custom/index.jsx |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index a959c60..97b6365 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -157,8 +157,21 @@
         inherit.cacheTime = config.cacheTime
       }
 
-      let regs = []
+      let userName = sessionStorage.getItem('User_Name') || ''
+      let fullName = sessionStorage.getItem('Full_Name') || ''
+      let city = sessionStorage.getItem('city') || ''
 
+      if (sessionStorage.getItem('isEditState') === 'true') {
+        userName = sessionStorage.getItem('CloudUserName') || ''
+        fullName = sessionStorage.getItem('CloudFullName') || ''
+      }
+
+      let regs = [
+        { reg: /@userName@/ig, value: userName },
+        { reg: /@fullName@/ig, value: fullName },
+        { reg: /@login_city@/ig, value: city }
+      ]
+      
       if (window.GLOB.externalDatabase !== null) {
         regs.push({
           reg: /@db@/ig,
@@ -828,6 +841,7 @@
     let diffUser = false
     let userName = sessionStorage.getItem('User_Name') || ''
     let fullName = sessionStorage.getItem('Full_Name') || ''
+    let city = sessionStorage.getItem('city') || ''
 
     if (sessionStorage.getItem('isEditState') === 'true') {
       userName = sessionStorage.getItem('CloudUserName') || ''
@@ -838,8 +852,8 @@
       let _script = item.script
 
       if (index === 0) {
-        _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
-          select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
+        _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+          select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
           ${_script}
         `
       }

--
Gitblit v1.8.0