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/header/index.jsx | 29 ++---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index 500dcba..3fe5ad4 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -1,21 +1,14 @@
import React, {Component} from 'react'
import { withRouter } from 'react-router-dom'
-import {connect} from 'react-redux'
import { Dropdown, Menu, Modal, notification, Switch, Button, Popover } from 'antd'
import { MenuFoldOutlined, SettingOutlined, AppstoreOutlined, DownOutlined, HomeOutlined, ApiOutlined, PlusOutlined, EditOutlined, MenuOutlined, DatabaseOutlined } from '@ant-design/icons'
import moment from 'moment'
-import asyncComponent from '@/utils/asyncComponent'
-import {
- modifyMenuTree,
- modifyMainMenu,
- resetEditLevel,
- logout
-} from '@/store/action'
import Api from '@/api'
import Utils from '@/utils/utils.js'
import avatar from '@/assets/img/avatar.jpg'
import MainLogo from '@/assets/img/main-logo.png'
+import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
import './index.scss'
@@ -43,7 +36,6 @@
content: '',
onOk() {
sessionStorage.clear()
- _this.props.logout()
_this.props.history.replace('/login')
},
onCancel() {}
@@ -543,21 +535,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menuTree: state.menuTree,
- mainMenu: state.mainMenu,
- editLevel: state.editLevel
- }
-}
-
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyMenuTree: (menuTree) => dispatch(modifyMenuTree(menuTree)),
- modifyMainMenu: (mainMenu) => dispatch(modifyMainMenu(mainMenu)),
- resetEditLevel: (level) => dispatch(resetEditLevel(level)),
- logout: () => dispatch(logout())
- }
-}
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Header))
\ No newline at end of file
+export default withRouter(Header)
\ No newline at end of file
--
Gitblit v1.8.0