From f3167f8371d19d0ea8fe7d0e7af5517ff0b08cd2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 07 四月 2021 23:25:29 +0800 Subject: [PATCH] 2021-04-07 --- src/components/header/index.jsx | 437 ++++++++++++++++++++---------------------------------- 1 files changed, 161 insertions(+), 276 deletions(-) diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx index 5e85185..aa7b4d2 100644 --- a/src/components/header/index.jsx +++ b/src/components/header/index.jsx @@ -4,33 +4,28 @@ import {connect} from 'react-redux' import { is, fromJS } from 'immutable' import moment from 'moment' -import { Dropdown, Menu, Icon, Modal, Form, notification, Switch, Button, Input, Badge } from 'antd' +import { Dropdown, Menu, Icon, Modal, Form, notification, Switch, Input, Badge } from 'antd' -import asyncComponent from '@/utils/asyncComponent' import { toggleCollapse, modifyMenuTree, modifyMainMenu, modifyTabview, - resetState, - resetEditState, - resetEditLevel, initActionPermission, initMenuPermission, logout } from '@/store/action' import Api from '@/api' +import MKEmitter from '@/utils/events.js' import options from '@/store/options.js' import zhCN from '@/locales/zh-CN/main.js' import enUS from '@/locales/en-US/main.js' import Utils from '@/utils/utils.js' import avatar from '@/assets/img/avatar.jpg' -import MainLogo from '@/assets/img/main-logo.png' import Resetpwd from './resetpwd' import LoginForm from './loginform' import './index.scss' -const EditMenu = asyncComponent(() => import('@/templates/menuconfig/editfirstmenu')) const { confirm } = Modal const { Search } = Input @@ -41,7 +36,7 @@ state = { menulist: null, // 涓�绾ц彍鍗� visible: false, // 淇敼瀵嗙爜妯℃�佹 - dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, + dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, confirmLoading: false, userName: sessionStorage.getItem('User_Name'), logourl: window.GLOB.mainlogo, @@ -53,15 +48,14 @@ thdMenuList: [], oriVersion: '', newVersion: '', - debug: sessionStorage.getItem('debug') === 'true' + debug: sessionStorage.getItem('debug') === 'true', + navBar: ['linkage_navigation', 'linkage'].includes(window.GLOB.navBar) ? 'topmenu' : '' } handleCollapse = () => { // 灞曞紑銆佹敹璧峰乏渚ц彍鍗曟爮 - if (!this.props.editState) { - this.props.toggleCollapse(!this.props.collapse) - localStorage.setItem('collapse', !this.props.collapse) - } + this.props.toggleCollapse(!this.props.collapse) + localStorage.setItem('collapse', !this.props.collapse) } changePassword = () => { @@ -133,50 +127,10 @@ changeMenu (value) { // 涓昏彍鍗曞垏鎹� - if (this.props.editState && this.props.editLevel) { - // 缂栬緫鐘舵�佷笅锛屼笉鍙垏鎹㈣彍鍗� - return - } - - if (value.PageParam.OpenType === 'menu') { + if (value.OpenType === 'outpage' && value.linkUrl) { + window.open(value.linkUrl) + } else if (value.OpenType === 'menu') { this.props.modifyMainMenu(value) - } else if (value.PageParam.OpenType === 'outpage') { - window.open(value.PageParam.linkUrl) - } - } - - async loadmenu () { - // 鑾峰彇涓昏彍鍗� - let _param = {func: 's_get_pc_menus', systemType: options.sysType} - if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�佹椂锛屽鍔犲弬鏁癲ebug - _param.debug = 'Y' - } - if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') { - _param.linkurl = window.GLOB.linkurl - } - _param.pro_sys = window.GLOB.systemType === 'production' ? 'Y' : '' - - let result = await Api.getSystemConfig(_param) - - // 鐧诲綍瓒呮椂 - if (!result) return - - if (result.status) { - const { menulist } = this.getMenulist(result) - - this.setState({ - menulist, - systems: [] - }) - - this.props.modifyMenuTree(menulist) - this.props.modifyMainMenu(menulist[0] || null) - } else { - notification.error({ - top: 92, - message: result.message, - duration: 10 - }) } } @@ -214,9 +168,6 @@ // 鑾峰彇涓昏彍鍗曞弬鏁� let menudefer = new Promise(resolve => { let _param = {func: 's_get_pc_menus', systemType: options.sysType} - if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') { - _param.linkurl = window.GLOB.linkurl - } _param.pro_sys = window.GLOB.systemType === 'production' ? 'Y' : '' Api.getSystemConfig(_param).then(result => { @@ -274,14 +225,19 @@ let tabs = fromJS(this.props.tabviews).toJS() let menu = fromJS(response[1]).toJS() - tabs = tabs.map(tab => { - tab.selected = false - return tab - }) + if (this.state.navBar === 'topmenu') { + menu.selected = true + this.props.modifyTabview([menu]) + } else { + tabs = tabs.map(tab => { + tab.selected = false + return tab + }) - menu.selected = true - tabs.push(menu) - this.props.modifyTabview(tabs) + menu.selected = true + tabs.push(menu) + this.props.modifyTabview(tabs) + } } }) } @@ -294,14 +250,18 @@ let fstItem = { MenuID: fst.MenuID, MenuName: fst.MenuName, - PageParam: {OpenType: 'menu', linkUrl: ''}, + OpenType: 'menu', children: [] } if (fst.PageParam) { try { fstItem.PageParam = JSON.parse(fst.PageParam) } catch (e) { - fstItem.PageParam = {OpenType: 'menu', linkUrl: ''} + fstItem.PageParam = null + } + if (fstItem.PageParam && fstItem.PageParam.OpenType === 'outpage' && fstItem.PageParam.linkUrl) { + fstItem.OpenType = 'outpage' + fstItem.linkUrl = fstItem.PageParam.linkUrl } } @@ -334,6 +294,7 @@ debug: sessionStorage.getItem('debug'), role_id: sessionStorage.getItem('role_id'), mainlogo: window.GLOB.mainlogo, + navBar: window.GLOB.navBar || '', mstyle: window.GLOB.style } @@ -344,6 +305,7 @@ ParentId: snd.MenuID, MenuID: trd.MenuID, MenuName: trd.MenuName, + ParentNames: [fst.MenuName, snd.MenuName], MenuNo: trd.MenuNo, EasyCode: trd.EasyCode, type: 'CommonTable', // 榛樿鍊间负甯哥敤琛� @@ -352,8 +314,7 @@ if (trd.LinkUrl && iframes.includes(trd.LinkUrl.split('?')[0])) { trdItem.type = 'iframe' - trdItem.LinkUrl = trd.LinkUrl - trdItem.forbidden = true + trdItem.LinkUrl = trd.LinkUrl.replace('&', '&') } else { try { trdItem.PageParam = trd.PageParam ? JSON.parse(trd.PageParam) : {OpenType: 'newtab'} @@ -364,9 +325,6 @@ trdItem.type = trdItem.PageParam.Template || trdItem.type trdItem.OpenType = trdItem.PageParam.OpenType || trdItem.OpenType - if (trdItem.type === 'CustomPage' && this.props.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄� - trdItem.forbidden = true - } if (trdItem.type === 'NewPage') { trdItem.src = trdItem.PageParam.url || '' @@ -409,16 +367,7 @@ return { menulist, thdMenuList } } - reload = () => { - this.loadmenu() - } - - changeEditState = (state) => { - if (!state) { // 閫�鍑虹紪杈戯紝椤甸潰鍒锋柊 - window.location.reload() - return - } - + changeEditState = () => { // 淇敼缂栬緫鐘舵�� let UserID = sessionStorage.getItem('CloudUserID') let LoginUID = sessionStorage.getItem('CloudLoginUID') @@ -428,64 +377,15 @@ loginVisible: true }) } else { - sessionStorage.setItem('isEditState', 'true') sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id')) sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM')) + sessionStorage.setItem('isEditState', 'true') - if (window.GLOB.systemType === 'production') { - this.props.resetEditLevel('HS') - this.props.modifyMainMenu({ - MenuID: 'systemManageView' - }) - - this.setState({ - userName: sessionStorage.getItem('CloudUserName'), - avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')) - }) - this.props.resetEditState(state) - - return - } - - this.setState({ - menulist: null, - userName: sessionStorage.getItem('CloudUserName'), - avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')) - }) - this.loadmenu() + this.props.modifyMenuTree([]) this.props.modifyMainMenu(null) - this.props.resetEditState(state) - } + this.props.modifyTabview([]) - if (window.GLOB.systemType !== 'production') { - Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => { - if (res.status) { - let _permFuncField = [] - let _sysRoles = [] - - if (res.Roles && res.Roles.length > 0) { - _sysRoles = res.Roles.map(role => { - return { - uuid: Utils.getuuid(), - value: role.RoleID, - text: role.RoleName - } - }) - } - - if (res.sModular && res.sModular.length > 0) { - res.sModular.forEach(field => { - if (field.ModularNo) { - _permFuncField.push(field.ModularNo) - } - }) - _permFuncField = _permFuncField.sort() - } - - sessionStorage.setItem('sysRoles', JSON.stringify(_sysRoles)) - sessionStorage.setItem('permFuncField', JSON.stringify(_permFuncField)) - } - }) + this.props.history.replace('/design') } } @@ -508,33 +408,11 @@ sessionStorage.setItem('dataM', res.dataM ? 'true' : '') sessionStorage.setItem('isEditState', 'true') - if (window.GLOB.systemType === 'production') { - this.props.resetEditLevel('HS') - this.props.modifyMainMenu({ - MenuID: 'systemManageView' - }) - - this.setState({ - loginVisible: false, - loginLoading: false, - userName: res.UserName, - avatar: res.icon - }) - this.props.resetEditState(true) - - return - } - - this.setState({ - menulist: null, - loginVisible: false, - loginLoading: false, - userName: res.UserName, - avatar: res.icon - }) - this.loadmenu() + this.props.modifyMenuTree([]) this.props.modifyMainMenu(null) - this.props.resetEditState(true) + this.props.modifyTabview([]) + + this.props.history.replace('/design') } else { this.setState({ loginLoading: false @@ -547,43 +425,6 @@ } }) }) - } - - enterEdit = () => { - // 杩涘叆缂栬緫鐘舵�� - this.props.resetEditLevel('level1') - } - - enterEditManage = () => { - const { editLevel } = this.props - - if (editLevel === 'HS') return - - this.props.resetEditLevel('HS') - this.props.modifyMainMenu({ - MenuID: 'systemManageView' - }) - } - - /** - * @description 閫�鍑虹鐞嗙晫闈㈣彍鍗� - */ - exitManage = () => { - const { menulist } = this.state - - if (window.GLOB.systemType === 'production') { // 姝e紡绯荤粺鐗堟湰鍗囩骇鍚庯紝椤甸潰鍒锋柊 - window.location.reload() - return - } - - this.props.modifyMainMenu(menulist[0] || null) - this.props.resetEditLevel(false) - this.props.modifyTabview([]) - } - - exitEdit = () => { - // 閫�鍑虹紪杈戠姸鎬� - this.props.resetEditLevel(false) } changeSystem = (system) => { @@ -626,26 +467,6 @@ } }) } - - selectMenu = (item) => { - let tabs = fromJS(this.props.tabviews).toJS() - let menu = fromJS(item).toJS() - menu.selected = true - - tabs = tabs.filter(tab => { - tab.selected = false - return tab.MenuID !== menu.MenuID - }) - - if (this.props.tabviews.length !== tabs.length) { - this.props.modifyTabview(fromJS(tabs).toJS()) - } - - this.setState({}, () => { - tabs.push(menu) - this.props.modifyTabview(tabs) - }) - } UNSAFE_componentWillMount () { // 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁 @@ -663,21 +484,26 @@ componentDidMount () { // 鑾峰彇绯荤粺鐨勭増鏈俊鎭紝寤舵椂鏌ヨ setTimeout(() => { - new Promise((resolve, reject) => { - Api.getAppVersion(resolve, reject) - }).then(res => { + Api.getAppVersion().then(res => { this.setState({ oriVersion: res.oldVersion, newVersion: res.newVersion }) - }, () => { - console.warn('websql 鍒濆鍖栭敊璇紒') - }) + }, () => {}) }, 1000) } shouldComponentUpdate (nextProps, nextState) { return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState)) + } + + /** + * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊 + */ + componentWillUnmount () { + this.setState = () => { + return + } } verup = () => { @@ -689,23 +515,23 @@ content: `鏈�鏂扮増鏈�${newVersion}锛屽綋鍓嶇増鏈�${oriVersion}`, onOk() { return new Promise(resolve => { - Api.updateAppVersion(newVersion).then(res => { - if (res.status) { - notification.success({ - top: 92, - message: '鍗囩骇鎴愬姛锛�', - duration: 2 - }) - _this.setState({oriVersion: newVersion}) - } else { - notification.warning({ - top: 92, - message: '鍗囩骇澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�', - duration: 2 - }) - } + if (!window.GLOB.WebSql) { + notification.warning({ + top: 92, + message: '鍗囩骇澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�', + duration: 2 + }) resolve() - }) + } else { + Api.updateAppVersion(newVersion) + notification.success({ + top: 92, + message: '鍗囩骇鎴愬姛锛�', + duration: 2 + }) + _this.setState({oriVersion: newVersion}) + resolve() + } }) }, onCancel() {} @@ -722,17 +548,57 @@ } } + changeVerMenu(menu, type) { + if (type === 'first') { + if (menu.OpenType === 'outpage' && menu.linkUrl) { + window.open(menu.linkUrl) + } else if (menu.OpenType === 'menu') { + + } + } else { + if (menu.OpenType === 'newpage' || menu.OpenType === 'NewPage') { // NewPage涓烘墦寮�澶栭儴椤甸潰鍦板潃锛宯ewpage涓烘墦寮�绯荤粺鑿滃崟 + window.open(menu.src) + } else if (menu.OpenType === 'blank') { + menu.selected = true + this.props.modifyTabview([menu]) + } else if (this.state.navBar === 'topmenu') { + menu.selected = true + this.props.modifyTabview([menu]) + } else { + let tabs = fromJS(this.props.tabviews).toJS() + tabs = tabs.filter(tab => { + tab.selected = false + return tab.MenuID !== menu.MenuID + }) + + if (this.props.tabviews.length > tabs.length) { + this.props.modifyTabview(fromJS(tabs).toJS()) + } + + this.setState({}, () => { + menu.selected = true + tabs.push(menu) + this.props.modifyTabview(tabs) + }) + } + + if (window.GLOB.systemType === 'production') { + MKEmitter.emit('queryTrigger', {menuId: menu.MenuID, name: '鑿滃崟'}) + } + } + } + render () { const { mainMenu, collapse } = this.props - const { thdMenuList, searchkey, oriVersion, newVersion, debug, menulist } = this.state + const { thdMenuList, searchkey, oriVersion, newVersion, debug, menulist, navBar } = this.state const menu = ( <Menu className="header-dropdown"> {debug && <Menu.Item key="switch"> {this.state.dict['main.edit']} - <Switch size="small" style={{marginLeft: '7px'}} disabled={!!this.props.editLevel} checked={this.props.editState} onChange={this.changeEditState} /> + <Switch size="small" style={{marginLeft: '7px'}} checked={false} onChange={this.changeEditState} /> </Menu.Item>} - {!this.props.editState ? <Menu.Item key="password" onClick={this.changePassword}>{this.state.dict['main.password']}</Menu.Item> : null} + <Menu.Item key="password" onClick={this.changePassword}>{this.state.dict['main.password']}</Menu.Item> {this.state.systems.length ? <Menu.SubMenu style={{minWidth: '110px'}} title="鍒囨崲绯荤粺"> {this.state.systems.map((system, index) => ( <Menu.Item style={{minWidth: '100px', lineHeight: '30px'}} key={'sub' + index} onClick={() => {this.changeSystem(system)}}> {system.AppName} </Menu.Item> @@ -748,13 +614,13 @@ return ( <header className="header-container ant-menu-dark" id="main-header-container"> - <div className={'header-logo ' + (collapse ? 'collapse' : '')}><img src={!this.props.editState ? this.state.logourl : MainLogo} alt=""/></div> - <div className={'header-collapse ' + (collapse ? 'collapse' : '')}> - {menulist && menulist.length ? <Icon type={collapse ? 'menu-unfold' : 'menu-fold'} onClick={this.handleCollapse}/> : null} + <div className={'header-logo ' + (collapse && navBar !== 'topmenu' ? 'collapse' : '')}><img src={this.state.logourl} alt=""/></div> + <div className={'header-collapse ' + (collapse && navBar !== 'topmenu' ? 'collapse' : '')}> + {navBar !== 'topmenu' ? <Icon type={collapse ? 'menu-unfold' : 'menu-fold'} onClick={this.handleCollapse}/> : null} </div> {/* 姝e父鑿滃崟 */} - {this.props.editLevel !== 'level1' && menulist ? - <ul className={'header-menu ' + this.props.editLevel}>{ + {navBar !== 'topmenu' && menulist ? + <ul className="header-menu">{ menulist.map(item => { return ( <li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={mainMenu && mainMenu.MenuID === item.MenuID ? 'active' : ''}> @@ -762,27 +628,52 @@ </li> ) })} - {this.props.editState && (!this.props.editLevel || this.props.editLevel === 'HS') ? - <li key="HS" onClick={this.enterEditManage} className={this.props.editLevel === 'HS' ? 'active' : ''}> - <span>HS</span> - </li> : null - } </ul> : null } - {this.props.editLevel === 'HS' ? <Button className="level4-close" type="primary" onClick={this.exitManage}>閫�鍑�</Button> : null} - {/* 杩涘叆缂栬緫鎸夐挳 */} - {this.props.editState && !this.props.editLevel ? <Icon onClick={this.enterEdit} className="edit-check" type="edit" /> : null} - {/* {this.props.editState && !this.props.editLevel && options.sysType === 'local' && window.GLOB.systemType !== 'production' ? - <a href="#/mobmanage" target="_blank" className="mobile" type="edit"> 搴旂敤绠$悊 <Icon type="arrow-right" /></a> : null - } */} - {/* window.btoa(window.encodeURIComponent(JSON.stringify({ MenuType: 'home', MenuId: 'home_page_id', MenuName: '棣栭〉' }))) */} - {this.props.editState && !this.props.editLevel && window.GLOB.systemType !== 'production' && this.props.memberLevel >= 20 ? - <a className="home-edit" href={`#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=`} target="_blank" rel="noopener noreferrer"> - 棣栭〉 <Icon type="arrow-right" /> - </a> : null + {/* 姝e父鑿滃崟 */} + {navBar === 'topmenu' && menulist ? + <ul className="header-menu vertical-menu">{ + menulist.map(item => { + if (item.children && item.children.length > 0) { + return ( + <Dropdown key={item.MenuID} overlayClassName="vertical-dropdown-menu" overlay={ + <Menu mode="vertical"> + {item.children.map(cell => { + if (!cell.children || cell.children.length === 0) { + return ( + <Menu.Item key={cell.MenuID}> + {cell.MenuName} + </Menu.Item> + ) + } else { + return ( + <Menu.SubMenu popupClassName="vertical-dropdown-submenu" key={cell.MenuID} title={cell.MenuName}> + {cell.children.map(m => ( + <Menu.Item key={m.MenuID} onClick={() => {this.changeVerMenu(m)}}> + {m.MenuName} + </Menu.Item> + ))} + </Menu.SubMenu> + ) + } + })} + </Menu> + }> + <li> + <span>{item.MenuName}</span> + </li> + </Dropdown> + ) + } else { + return ( + <li key={item.MenuID} onClick={() => {this.changeVerMenu(item, 'first')}}> + <span>{item.MenuName}</span> + </li> + ) + } + })} + </ul> : null } - {/* 缂栬緫鑿滃崟 */} - {this.props.editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null} {/* 澶村儚銆佺敤鎴峰悕 */} <Dropdown className="header-setting" overlay={menu}> <div> @@ -793,7 +684,7 @@ </div> </Dropdown> {/* 鑿滃崟鎼滅储 */} - {!this.props.editState && thdMenuList.length > 0 ? + {thdMenuList.length > 0 ? <Dropdown overlayClassName="menu-select-dropdown" getPopupContainer={() => document.getElementById('main-header-container')} overlay={ <div> <Search @@ -814,12 +705,12 @@ option.MenuNo.toLowerCase().indexOf(searchkey.toLowerCase()) >= 0 || option.EasyCode.toLowerCase().indexOf(searchkey.toLowerCase()) >= 0 ) { - return <Menu.Item key={option.MenuID} onClick={() => this.selectMenu(option)}>{option.MenuName}</Menu.Item> + return <Menu.Item key={option.MenuID} onClick={() => this.changeVerMenu(option)}>{option.MenuName}</Menu.Item> } else { return null } } - return <Menu.Item key={option.MenuID} onClick={() => this.selectMenu(option)}>{option.MenuName}</Menu.Item> + return <Menu.Item key={option.MenuID} onClick={() => this.changeVerMenu(option)}>{option.MenuName}</Menu.Item> })} </Menu> </div> @@ -862,10 +753,7 @@ collapse: state.collapse, menuTree: state.menuTree, mainMenu: state.mainMenu, - editState: state.editState, - editLevel: state.editLevel, permAction: state.permAction, - memberLevel: state.memberLevel } } @@ -875,11 +763,8 @@ modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews)), modifyMenuTree: (menuTree) => dispatch(modifyMenuTree(menuTree)), modifyMainMenu: (mainMenu) => dispatch(modifyMainMenu(mainMenu)), - resetEditState: (state) => dispatch(resetEditState(state)), - resetEditLevel: (level) => dispatch(resetEditLevel(level)), initActionPermission: (permAction) => dispatch(initActionPermission(permAction)), initMenuPermission: (permMenus) => dispatch(initMenuPermission(permMenus)), - resetState: () => dispatch(resetState()), logout: () => dispatch(logout()) } } -- Gitblit v1.8.0