From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/design/header/index.jsx | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index 70fd769..f41e3ec 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -16,6 +16,8 @@
const VersionsUp = asyncComponent(() => import('./versions'))
const ThawMenu = asyncComponent(() => import('@/components/thawmenu'))
const MenuForm = asyncComponent(() => import('./editfirstmenu/menuform'))
+const TransMenu = asyncComponent(() => import('./transmenu'))
+
const { confirm } = Modal
class Header extends Component {
@@ -24,6 +26,7 @@
userName: sessionStorage.getItem('CloudUserName'),
avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
logo: sessionStorage.getItem('CloudLogo') || MainLogo,
+ subLang: sessionStorage.getItem('subLangList') !== null,
visible: false,
loading: false
}
@@ -37,6 +40,7 @@
onOk() {
sessionStorage.clear()
_this.props.history.replace('/login')
+ window.location.reload()
},
onCancel() {}
})
@@ -409,7 +413,7 @@
render () {
const { mainMenu, editLevel } = this.props
- const { menulist, visible, loading, logo } = this.state
+ const { menulist, visible, loading, logo, subLang } = this.state
return (
<header className={'sys-header-container ant-menu-dark ' + (['level2', 'level3'].includes(editLevel) ? 'mask' : '')} id="main-header-container">
@@ -493,6 +497,12 @@
缂栬緫
</Button>
</div> : null}
+ {window.GLOB.systemType !== 'production' && subLang ? <div className="entrance">
+ <div className="icon"><PlusOutlined /></div>
+ <div className="title">鑿滃崟杞崲</div>
+ <div className="detail">鍙�夋嫨姣嶈绯荤粺鐨勮彍鍗曪紝蹇�熻浆鎹㈠埌褰撳墠璇█銆傛墦鍗版ā鏉胯鍦℉S涓嬪鍒跺悗锛屽湪姝ゅ閫夋嫨鎸囧畾妯℃澘杩涜璇█杞崲銆�</div>
+ <TransMenu reload={this.reload} menulist={menulist}/>
+ </div> : null}
</div>
{/* 缂栬緫鑿滃崟 */}
{editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null}
--
Gitblit v1.8.0