From d6dfba48678e1107a9e7c6524e1dfa2d3fdff03c Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 08 十月 2021 19:29:21 +0800 Subject: [PATCH] 2021-10-08 --- src/tabviews/custom/components/share/normalTable/index.jsx | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx index a1bb8fc..800a973 100644 --- a/src/tabviews/custom/components/share/normalTable/index.jsx +++ b/src/tabviews/custom/components/share/normalTable/index.jsx @@ -5,7 +5,6 @@ import { is, fromJS } from 'immutable' import { Table, Typography, Icon, Col, Switch, message } from 'antd' -import { modifyTabview } from '@/store/action' import asyncComponent from '@/utils/asyncComponent' import MKEmitter from '@/utils/events.js' import zhCN from '@/locales/zh-CN/main.js' @@ -564,7 +563,6 @@ // 瀛楁閫忚 triggerLink = (e, item, record) => { - const { tabviews } = this.props e.stopPropagation() let __param = { @@ -583,21 +581,12 @@ let tabmenu = item.linkThdMenu tabmenu.param = __param - tabmenu.selected = true - - let tabs = tabviews.filter((tab, i) => { - tab.selected = false - return tab.MenuID !== tabmenu.MenuID - }) - - if (tabviews.length > tabs.length) { - this.props.modifyTabview(fromJS(tabs).toJS()) + + if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) { + MKEmitter.emit('modifyTabs', tabmenu, 'replace') + } else { + MKEmitter.emit('modifyTabs', tabmenu, 'plus', true) } - - this.setState({}, () => { - tabs.push(tabmenu) - this.props.modifyTabview(tabs) - }) } else if (item.linkurl) { let src = item.linkurl @@ -907,15 +896,12 @@ const mapStateToProps = (state) => { return { menuType: state.editLevel, - tabviews: state.tabviews, memberLevel: state.memberLevel } } -const mapDispatchToProps = (dispatch) => { - return { - modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews)) - } +const mapDispatchToProps = () => { + return {} } export default connect(mapStateToProps, mapDispatchToProps)(NormalTable) \ No newline at end of file -- Gitblit v1.8.0