From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/header/index.jsx | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index f18821f..187b7fa 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -148,8 +148,10 @@
cancelText: dict['cancel'] || '鍙栨秷',
onOk() {
sessionStorage.clear()
- that.props.history.replace('/login')
- window.location.reload()
+ setTimeout(() => {
+ that.props.history.replace('/login')
+ window.location.reload()
+ }, 100)
},
onCancel() {}
})
@@ -314,9 +316,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 +373,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'
}
@@ -453,7 +455,7 @@
if (!isNaN(s) && s > 90) {
Modal.warning({
width: 520,
- title: <span>绯荤粺妫�娴嬪埌鎮ㄧ殑璐︽埛瀛樺湪椋庨櫓锛岃鍙婃椂鍒�<a target="_blank" rel="noopener noreferrer" href="https://cloud.mk9h.cn/admin/index.html">浜戜腑蹇�</a>淇敼瀵嗙爜锛�</span>,
+ title: <span>绯荤粺妫�娴嬪埌鎮ㄧ殑璐︽埛瀛樺湪椋庨櫓锛岃鍙婃椂鍒�<a target="_blank" rel="noopener noreferrer" href="https://cloud.positecgroup.com/admin/index.html">浜戜腑蹇�</a>淇敼瀵嗙爜锛�</span>,
okText: '鐭ラ亾浜�'
})
return
--
Gitblit v1.8.0