From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/components/header/index.jsx | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 991636e..d53c6ed 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -11,7 +11,8 @@
modifyMainMenu,
logout
} from '@/store/action'
-import asyncComponent from '@/utils/asyncSpinComponent'
+import asyncSpinComponent from '@/utils/asyncSpinComponent'
+import asyncComponent from '@/utils/asyncComponent'
import Api from '@/api'
import MKEmitter from '@/utils/events.js'
import options from '@/store/options.js'
@@ -22,7 +23,8 @@
const { confirm } = Modal
const { Search } = Input
const Resetpwd = asyncComponent(() => import('@/components/resetPassword'))
-const LoginForm = asyncComponent(() => import('./loginform'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
+const LoginForm = asyncSpinComponent(() => import('./loginform'))
class Header extends Component {
static propTpyes = {
@@ -33,7 +35,6 @@
userName: '',
fullName: '',
logourl: window.GLOB.mainlogo,
- appVersion: window.GLOB.appVersion,
loginVisible: false,
loginLoading: false,
avatar: Utils.getrealurl(sessionStorage.getItem('avatar')),
@@ -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)
}
@@ -187,8 +190,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(/@userid@/ig, sessionStorage.getItem('UserID')).replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+ fstItem.type = 'iframe'
+ fstItem.OpenType = 'newtab'
+ }
}
} catch (e) {}
}
@@ -236,16 +244,20 @@
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(/@userid@/ig, sessionStorage.getItem('UserID')).replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+ trdItem.type = 'iframe'
+ trdItem.OpenType = 'newtab'
+ }
+ } 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 +300,6 @@
loginVisible: true
})
} else {
- sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
- sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
sessionStorage.setItem('isEditState', 'true')
this.props.modifyMainMenu(null)
@@ -332,8 +342,6 @@
sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('cloudRole_id', res.role_id || '')
- sessionStorage.setItem('role_id', res.role_id || '')
- sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
sessionStorage.setItem('isEditState', 'true')
if (param.remember) {
@@ -444,12 +452,6 @@
setTimeout(() => {
Api.getAppVersion()
}, 1000)
- // Api.genericInterface({
- // func: 's_get_fcc_account_data',
- // fcc_date: '2022-03-01',
- // search_type: ''
- // }).then(res => {
- // })
// sessionStorage 璺ㄩ〉闈㈠叡浜�
window.addEventListener('storage', (e) => {
@@ -491,8 +493,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') {
@@ -540,7 +544,15 @@
about = () => {
Modal.success({
- title: '绯荤粺鐗堟湰v' + this.state.appVersion
+ title: '绯荤粺鐗堟湰v' + window.GLOB.appVersion
+ })
+ }
+
+ 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: '鍏抽棴'
})
}
@@ -552,7 +564,7 @@
render () {
const { mainMenu, collapse } = this.props
- const { thdMenuList, searchkey, debug, menulist, appVersion } = this.state
+ const { thdMenuList, searchkey, debug, menulist } = this.state
const navBar = window.GLOB.navBar
const menu = (
@@ -571,7 +583,10 @@
<Menu.Item key="verup" onClick={this.verup}>
椤甸潰鏇存柊
</Menu.Item>
- {appVersion ? <Menu.Item key="version" onClick={this.about}>
+ {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}
<Menu.Item key="logout" onClick={this.logout}>閫�鍑�</Menu.Item>
--
Gitblit v1.8.0