From 7e46c386be5c2cfc20af3936d26839ad3fce44b0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 八月 2023 17:40:32 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/sidemenu/index.jsx | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index 2e51d24..263d66f 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -1,6 +1,4 @@
import React, {Component} from 'react'
-import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { Menu } from 'antd'
@@ -11,17 +9,44 @@
const { SubMenu } = Menu
class Sidemenu extends Component {
- static propTypes = {
- collapse: PropTypes.bool
- }
-
state = {
subMenulist: [], // 浜岀骇鑿滃崟
rootSubmenuKeys: null,
+ collapse: sessionStorage.getItem('collapse') === 'true',
openKeys: null
}
- async loadsubmenu (menu) {
+ componentDidMount() {
+ MKEmitter.addListener('mainMenuChange', this.loadsubmenu)
+ MKEmitter.addListener('toggleCollapse', this.toggleCollapse)
+
+ if (window.GLOB.mainMenu) {
+ this.loadsubmenu()
+ }
+ }
+
+ shouldComponentUpdate(nextProps, nextState) {
+ return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('mainMenuChange', this.loadsubmenu)
+ MKEmitter.removeListener('toggleCollapse', this.toggleCollapse)
+ }
+
+ toggleCollapse = (collapse) => {
+ this.setState({
+ collapse: collapse,
+ openKeys: []
+ })
+ }
+
+ loadsubmenu = () => {
+ let menu = window.GLOB.mainMenu
+
if (!menu || !menu.MenuID) { // 娌℃湁涓昏彍鍗曟椂锛屾竻绌轰笅绾ц彍鍗�
this.setState({
subMenulist: [],
@@ -41,7 +66,7 @@
this.setState({
subMenulist: menu.children,
rootSubmenuKeys: menu.children.map(item => item.MenuID),
- openKeys: this.props.collapse ? [] : [openKey],
+ openKeys: this.state.collapse ? [] : [openKey],
})
}
@@ -59,22 +84,6 @@
}
}
- UNSAFE_componentWillReceiveProps (nextProps) {
- if (!is(fromJS(this.props.mainMenu), fromJS(nextProps.mainMenu))) {
- // 涓昏彍鍗曞垏鎹紝璇锋眰2銆�3绾ц彍鍗曟暟鎹�
- this.loadsubmenu(nextProps.mainMenu)
- } else if (nextProps.collapse && this.props.collapse !== nextProps.collapse) {
- // 灞曞紑鍚堝苟鏃讹紝鍏抽棴灞曞紑鑿滃崟
- this.setState({
- openKeys: []
- })
- }
- }
-
- shouldComponentUpdate(nextProps, nextState) {
- return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
- }
-
onOpenChange = openKeys => {
const latestOpenKey = openKeys.find(key => this.state.openKeys.indexOf(key) === -1)
if (this.state.rootSubmenuKeys.indexOf(latestOpenKey) === -1) {
@@ -87,13 +96,13 @@
}
render () {
- const { mainMenu } = this.props
+ const { collapse } = this.state
- if (mainMenu === '') return (<span className="mk-side-menu-hidden"></span>)
+ if (window.GLOB.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' : '')}>
- <Menu openKeys={this.state.openKeys} onOpenChange={this.onOpenChange} mode="inline" theme="dark" inlineCollapsed={this.props.collapse}>
+ <aside id="mk-sidemenu-wrap" className={'mk-side-menu ant-menu-dark' + (collapse ? ' collapsed' : '')}>
+ <Menu openKeys={this.state.openKeys} onOpenChange={this.onOpenChange} mode="inline" theme="dark" inlineCollapsed={collapse}>
{this.state.subMenulist && this.state.subMenulist.map((item) => {
return (
<SubMenu
@@ -121,15 +130,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- collapse: state.collapse,
- mainMenu: state.mainMenu,
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Sidemenu)
\ No newline at end of file
+export default Sidemenu
\ No newline at end of file
--
Gitblit v1.8.0