From 1da6506bf58270bacc2a4345002c6b082835580e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 十月 2021 23:17:08 +0800
Subject: [PATCH] 2021-10-21
---
src/components/sidemenu/index.jsx | 31 +++++--------------------------
1 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index 4bb0b8b..fcbc8f2 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -4,7 +4,6 @@
import { is, fromJS } from 'immutable'
import { Menu, Icon } from 'antd'
-import { modifyTabview } from '@/store/action'
import MKEmitter from '@/utils/events.js'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
@@ -55,24 +54,9 @@
if (menu.OpenType === 'newpage' || menu.OpenType === 'NewPage') {
window.open(menu.src)
} else if (menu.OpenType === 'blank') {
- menu.selected = true
- this.props.modifyTabview([menu])
+ MKEmitter.emit('modifyTabs', menu, 'replace')
} 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)
- })
+ MKEmitter.emit('modifyTabs', menu, 'plus')
}
if (window.GLOB.systemType === 'production') {
@@ -113,7 +97,7 @@
if (mainMenu === '') return (<span className="mk-side-menu-hidden"></span>)
return (
- <aside id="mk-sidemenu-wrap" className={'mk-side-menu ant-menu-dark' + (this.props.collapse ? ' collapsed' : '') + (this.props.isiframe ? ' mk-iframe' : '')}>
+ <aside id="mk-sidemenu-wrap" className={'mk-side-menu ant-menu-dark' + (this.props.collapse ? ' collapsed' : '')}>
<Menu openKeys={this.state.openKeys} onOpenChange={this.onOpenChange} mode="inline" theme="dark" inlineCollapsed={this.props.collapse}>
{this.state.subMenulist && this.state.subMenulist.map((item) => {
return (
@@ -144,18 +128,13 @@
const mapStateToProps = (state) => {
return {
- tabviews: state.tabviews,
collapse: state.collapse,
- isiframe: state.isiframe,
mainMenu: state.mainMenu,
- menuTree: state.menuTree,
}
}
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews)),
- }
+const mapDispatchToProps = () => {
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(Sidemenu)
\ No newline at end of file
--
Gitblit v1.8.0