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/views/design/sidemenu/index.jsx | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/views/design/sidemenu/index.jsx b/src/views/design/sidemenu/index.jsx
index 5874b6d..3e07e00 100644
--- a/src/views/design/sidemenu/index.jsx
+++ b/src/views/design/sidemenu/index.jsx
@@ -1,12 +1,10 @@
import React, {Component} from 'react'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { Menu, Popover, Modal, notification } from 'antd'
import { EditOutlined, PlusOutlined, SettingOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
-import { resetEditLevel } from '@/store/action'
import Utils from '@/utils/utils.js'
import Api from '@/api'
import MKEmitter from '@/utils/events.js'
@@ -349,6 +347,7 @@
menulist={this.state.editMenu.children}
supMenuList={mainMenu.children}
supMenu={this.state.editMenu}
+ menuTree={this.props.menuTree}
exitEdit={this.exitEdit}
/> : null
}
@@ -386,18 +385,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- mainMenu: state.mainMenu,
- menuTree: state.menuTree,
- editLevel: state.editLevel
- }
-}
-
-const mapDispatchToProps = (dispatch) => {
- return {
- resetEditLevel: (level) => dispatch(resetEditLevel(level))
- }
-}
-
-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