From 051981a2211bb86f88a6d68f2e29816f8caeac20 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 八月 2023 09:18:10 +0800
Subject: [PATCH] 2023-08-04
---
src/components/header/index.jsx | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 8c1efa8..5fac2c3 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -23,6 +23,7 @@
const { confirm } = Modal
const { Search } = Input
const Resetpwd = asyncComponent(() => import('@/components/resetPassword'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
const LoginForm = asyncSpinComponent(() => import('./loginform'))
class Header extends Component {
@@ -79,8 +80,10 @@
changeMenu (value) {
// 涓昏彍鍗曞垏鎹�
- if (value.OpenType === 'outpage') {
- window.open(value.linkUrl)
+ if (value.OpenType === 'newpage') {
+ window.open(value.src)
+ } else if (value.OpenType === 'newtab') {
+ MKEmitter.emit('modifyTabs', value)
} else if (value.OpenType === 'menu') {
this.props.modifyMainMenu(value)
}
@@ -132,12 +135,9 @@
window.GLOB.mkThdMenus = [...thdMenuList, {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'}]
- if (_menu) { // 寤舵椂鎵撳紑锛岄槻姝㈡爣绛剧粍鏈畬鎴愬姞杞�
- setTimeout(() => {
- MKEmitter.emit('modifyTabs', _menu)
- }, 200)
+ if (_menu) {
+ this.openTab(_menu, 0)
}
- MKEmitter.emit('mkMenuLoaded')
})
// 鑾峰彇瑙掕壊鏉冮檺, edition_type 鎺ュ彛鐗堟湰鎺у埗 ''銆�'Y'銆�'A'
@@ -164,10 +164,24 @@
})
}
- MKEmitter.emit('mkActionLoaded')
window.GLOB.mkActions = _permAction
})
}, 50)
+ }
+
+ openTab = (menu, times) => {
+ if (times > 50) return
+ times++
+
+ let tabgroup = document.getElementById('mk-tabgroup-wrap')
+
+ if (window.GLOB.mkActions.loaded && tabgroup) {
+ MKEmitter.emit('modifyTabs', menu)
+ } else {
+ setTimeout(() => {
+ this.openTab(times)
+ }, 200)
+ }
}
getMenulist = (result) => {
@@ -187,8 +201,13 @@
let PageParam = JSON.parse(fst.PageParam)
if (PageParam.OpenType === 'outpage' && PageParam.linkUrl) {
- fstItem.OpenType = 'outpage'
- fstItem.linkUrl = PageParam.linkUrl
+ fstItem.OpenType = 'newpage'
+ fstItem.src = PageParam.linkUrl
+ if (/#\/iframe\//.test(fstItem.src)) {
+ fstItem.src = fstItem.src.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+ fstItem.type = 'iframe'
+ fstItem.OpenType = 'newtab'
+ }
}
} catch (e) {}
}
@@ -236,16 +255,23 @@
trdItem.hidden = PageParam.hidden || 'false'
if (trdItem.type === 'NewPage') {
+ trdItem.OpenType = 'newpage'
trdItem.src = PageParam.url || ''
+ if (/#\/iframe\//.test(trdItem.src)) {
+ trdItem.src = trdItem.src.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+ trdItem.type = 'iframe'
+ trdItem.OpenType = 'newtab'
+ }
+ } else if (trdItem.OpenType === 'view') {
+ trdItem.OpenType = 'newpage'
+ trdItem.src = '#/view/' + trd.MenuID
+ } else {
+ trdItem.src = '#/tab/' + trd.MenuID
}
} catch (e) {}
- }
-
- if (trdItem.type !== 'NewPage') {
+ } else {
trdItem.src = '#/tab/' + trd.MenuID
}
-
- trdItem.OpenType = trdItem.OpenType.toLowerCase() // NewPage涓烘墦寮�澶栭儴椤甸潰鍦板潃
if (names.has(trdItem.menu_name)) {
doublenames.set(trdItem.menu_name, true)
@@ -288,8 +314,6 @@
loginVisible: true
})
} else {
- sessionStorage.setItem('isEditState', 'true')
-
this.props.modifyMainMenu(null)
this.props.history.replace('/design')
@@ -330,12 +354,11 @@
sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('cloudRole_id', res.role_id || '')
- sessionStorage.setItem('isEditState', 'true')
-
+ let _url = window.location.href.split('#')[0] + 'cloud'
if (param.remember) {
- let _url = window.location.href.split('#')[0] + 'cloud'
-
localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({time: new Date().getTime(), username: param.username, password: param.password}))))
+ } else {
+ localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({time: new Date().getTime(), username: param.username, password: ''}))))
}
this.props.modifyMainMenu(null)
@@ -445,6 +468,8 @@
window.addEventListener('storage', (e) => {
if (e.key === 'getSessionStorage' && e.newValue === window.GLOB.appkey) {
localStorage.setItem('sessionStorage', JSON.stringify(sessionStorage))
+ } else if (e.key === 'getSysPermission' && e.newValue === window.GLOB.appkey) {
+ localStorage.setItem('sysPermissions', JSON.stringify({mkThdMenus: window.GLOB.mkThdMenus, mkActions: window.GLOB.mkActions}))
} else if (e.key === 'menuUpdate') {
let menuId = e.newValue.split(',')[1]
if (menuId) {
@@ -481,8 +506,10 @@
changeVerMenu(menu, type) {
if (type === 'first') {
- if (menu.OpenType === 'outpage') {
- window.open(menu.linkUrl)
+ if (menu.OpenType === 'newpage') {
+ window.open(menu.src)
+ } else if (menu.OpenType === 'newtab') {
+ MKEmitter.emit('modifyTabs', menu)
}
} else {
if (menu.OpenType === 'newpage') {
@@ -534,6 +561,14 @@
})
}
+ wxnotice = () => {
+ Modal.success({
+ className: 'mk-wx-notice',
+ title: <QrCode card={{qrWidth: 320, color: '#000000'}} value={window.GLOB.baseurl + 'mob/wxnotice.html?userid=' + sessionStorage.getItem('UserID') + '&loginuid=' + sessionStorage.getItem('LoginUID')}/>,
+ okText: '鍏抽棴'
+ })
+ }
+
changeToHome = () => {
if (!['linkage', 'menu_board'].includes(window.GLOB.navBar)) return
@@ -561,6 +596,9 @@
<Menu.Item key="verup" onClick={this.verup}>
椤甸潰鏇存柊
</Menu.Item>
+ {window.GLOB.WXNotice ? <Menu.Item key="wxnotice" onClick={this.wxnotice}>
+ 寰俊娑堟伅
+ </Menu.Item> : null}
{window.GLOB.appVersion ? <Menu.Item key="version" onClick={this.about}>
鍏充簬
</Menu.Item> : null}
--
Gitblit v1.8.0