From b5478fbd38d5b3406c739998e9aaed45a25cac1f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 四月 2025 15:12:48 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/components/header/index.jsx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 6eec509..5649904 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -314,9 +314,9 @@
           if (PageParam.OpenType === 'outpage' && PageParam.linkUrl) {
             fstItem.OpenType = 'newpage'
             fstItem.src = window.GLOB.systemType === 'production' && PageParam.linkProUrl ? PageParam.linkProUrl : PageParam.linkUrl
+            fstItem.src = fstItem.src.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+            fstItem.src = fstItem.src.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
             if (/#\/iframe\//.test(fstItem.src)) {
-              fstItem.src = fstItem.src.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
-              fstItem.src = fstItem.src.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
               fstItem.type = 'iframe'
               fstItem.OpenType = 'newtab'
             }
@@ -371,9 +371,9 @@
                   if (trdItem.type === 'NewPage') {
                     trdItem.OpenType = 'newpage'
                     trdItem.src = window.GLOB.systemType === 'production' && PageParam.proUrl ? PageParam.proUrl : PageParam.url || ''
+                    trdItem.src = trdItem.src.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+                    trdItem.src = trdItem.src.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
                     if (/#\/iframe\//.test(trdItem.src)) {
-                      trdItem.src = trdItem.src.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
-                      trdItem.src = trdItem.src.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
                       trdItem.type = 'iframe'
                       trdItem.OpenType = 'newtab'
                     }

--
Gitblit v1.8.0