From 3683e1475e8d74f690172a468518d88d91a69ccc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 八月 2020 20:15:48 +0800
Subject: [PATCH] 2020-08-20
---
src/components/sidemenu/index.jsx | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index 7f7df7d..2b4da50 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -7,15 +7,15 @@
import asyncComponent from '@/utils/asyncComponent'
import { modifyTabview, resetEditLevel } from '@/store/action'
-import { SySMenuList } from './config.js'
+import { SySMenuList } from './config'
import options from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/header.js'
-import enUS from '@/locales/en-US/header.js'
+import zhCN from '@/locales/zh-CN/main.js'
+import enUS from '@/locales/en-US/main.js'
import Api from '@/api'
import './index.scss'
-const EditSecMenu = asyncComponent(() => import('./editsecmenu'))
-const EditThdMenu = asyncComponent(() => import('./editthdmenu'))
+const EditSecMenu = asyncComponent(() => import('@/templates/menuconfig/editsecmenu'))
+const EditThdMenu = asyncComponent(() => import('@/templates/menuconfig/editthdmenu'))
const { SubMenu } = Menu
class Sidemenu extends Component {
@@ -28,9 +28,9 @@
}
state = {
- dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
mainMenuList: null, // 涓�绾ц彍鍗曪紝缂栬緫璋冩暣涓婄骇鑿滃崟鏃惰幏鍙�
- subMenulist: null, // 浜岀骇鑿滃崟
+ subMenulist: [], // 浜岀骇鑿滃崟
editMenu: null, // 缂栬緫涓夌骇鑿滃崟鏃惰缃�
rootSubmenuKeys: null,
createThirdMenu: false,
@@ -49,7 +49,7 @@
return
}
- let _param = {func: 'sPC_Get_FunMenu', ParentID: menu.MenuID, systemType: options.systemType}
+ let _param = {func: 'sPC_Get_FunMenu', ParentID: menu.MenuID, systemType: options.sysType}
if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�佹椂锛岃幏鍙栬彍鍗曪紝澧炲姞鍙傛暟debug
_param.debug = 'Y'
@@ -57,19 +57,20 @@
let result = await Api.getSystemConfig(_param)
if (result.status) {
+ if (this.props.editState && this.props.editLevel === 'HS') return
+
if (result.data.length === 0) { // 鏌ヨ鑿滃崟涓虹┖
this.setState({
subMenulist: [],
rootSubmenuKeys: [],
- openKeys: [],
- editMenu: null
+ openKeys: []
})
return
}
let SubMenuId = sessionStorage.getItem('SubMenu') // 鏄惁涓烘墦寮�鏂伴〉闈�
let ThirdMenuId = sessionStorage.getItem('ThirdMenu') // 鏄惁涓烘墦寮�鏂伴〉闈�
- let msg = sessionStorage.getItem('UserID') + '&sd=' + sessionStorage.getItem('SessionUid') + '&ld=' + sessionStorage.getItem('LoginUID') + '&un=' + sessionStorage.getItem('User_Name')
+ let msg = sessionStorage.getItem('UserID') + '&ld=' + sessionStorage.getItem('LoginUID') + '&un=' + sessionStorage.getItem('User_Name')
let submenuId = '' // 灞曞紑浜岀骇鑿滃崟ID
let tabId = '' // 鎵撳紑鐨則ab椤礽d
@@ -108,7 +109,9 @@
if (item.FunMenu) {
_smenu.children = item.FunMenu.map(child => {
- let _tmenu = {}
+ let _tmenu = {
+ ParentId: item.ParentID
+ }
// 鎵撳紑鏂伴〉闈㈤摼鎺�
_tmenu.src = '#/main/' + window.btoa('mm=' + menu.MenuID + '&sm=' + _smenu.MenuID + '&tm=' + child.MenuID + '&ud=' + msg)
@@ -165,7 +168,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -173,9 +176,19 @@
enterManageView = (type) => {
let menulist = SySMenuList[type]
- menulist.forEach(menu => {
- menu.children = menu.children.filter(item => !item.systems || item.systems.includes(options.systemType))
- })
+ if (window.GLOB.systemType === 'production') {
+ menulist.forEach(menu => {
+ menu.children = menu.children.filter(item => item.systems && item.systems.includes(window.GLOB.systemType))
+ })
+
+ menulist = menulist.filter(menu => menu.children.length > 0)
+ } else {
+ menulist.forEach(menu => {
+ menu.children = menu.children.filter(item => !item.systems || item.systems.includes(options.sysType))
+ })
+
+ menulist = menulist.filter(menu => menu.children.length > 0)
+ }
this.setState({
subMenulist: menulist,
@@ -185,7 +198,7 @@
}
changemenu(e) {
- if (this.props.editState && this.props.editLevel !== 'level4') {
+ if (this.props.editState && this.props.editLevel !== 'HS') {
e.preventDefault()
return
}
@@ -278,11 +291,11 @@
const editShow = (this.props.editState && !this.props.editLevel) || false
return (
- <aside className={"side-menu ant-menu-dark" + (this.props.collapse ? ' side-menu-collapsed' : '') + (this.props.isiframe ? ' iframe' : '')}>
- {this.state.subMenulist && !(this.props.editLevel === 'level2' || this.props.editLevel === 'level3') &&
+ <aside className={"side-menu ant-menu-dark" + (this.props.collapse ? ' side-menu-collapsed' : '') + (this.props.isiframe ? ' iframe' : '') + (this.props.editState ? ' edit' : '')}>
+ {!(this.props.editLevel === 'level2' || this.props.editLevel === 'level3') &&
<Menu openKeys={this.state.openKeys} onOpenChange={this.onOpenChange} mode="inline" theme="dark" inlineCollapsed={this.props.collapse}>
{editShow && <li className="sup-menu"><Icon onClick={this.enterSubEdit} className="edit-check" type="edit" /></li>}
- {this.state.subMenulist.map((item, index) => {
+ {this.state.subMenulist && this.state.subMenulist.map((item, index) => {
return (
<SubMenu
key={item.MenuID}
@@ -293,9 +306,9 @@
</span>
}
>
- {editShow && <li className={'ant-menu-item ' + (item.children.length > 0 ? 'sub-menu' : '')}>
+ {editShow ? <li className={'ant-menu-item ' + (item.children.length > 0 ? 'sub-menu' : '')}>
<Icon onClick={(e) => {this.enterThrEdit(e, item)}} className="edit-check" type="edit" />
- </li>}
+ </li> : null}
{item.children.map(cell => {
return (
<Menu.Item key={cell.MenuID}>
@@ -307,23 +320,23 @@
)
})}
</Menu>}
- {this.props.editLevel === 'level2' &&
+ {this.props.editLevel === 'level2' ?
<EditSecMenu
menulist={this.state.subMenulist}
supMenuList={this.state.mainMenuList}
supMenu={this.props.mainMenu}
reload={this.reload}
exitEdit={this.exitEdit}
- />
+ /> : null
}
- {this.props.editLevel === 'level3' && this.state.subMenulist &&
+ {this.props.editLevel === 'level3' && this.state.subMenulist && this.state.editMenu ?
<EditThdMenu
menulist={this.state.editMenu.children}
supMenuList={this.state.subMenulist}
supMenu={this.state.editMenu}
reload={this.reload}
exitEdit={this.exitEdit}
- />
+ /> : null
}
</aside>
)
--
Gitblit v1.8.0