ddcat1115 8 lat temu
rodzic
commit
bba32aa720

+ 2 - 4
src/components/SiderMenu/SiderMenu.js

@@ -1,9 +1,7 @@
 import React, { PureComponent } from 'react';
 import { Layout, Menu, Icon } from 'antd';
 import { Link } from 'dva/router';
-import logo from '../../assets/logo.svg';
 import styles from './index.less';
-import { getMenuData } from '../../common/menu';
 
 const { Sider } = Layout;
 const { SubMenu } = Menu;
@@ -11,7 +9,7 @@ const { SubMenu } = Menu;
 export default class SiderMenu extends PureComponent {
   constructor(props) {
     super(props);
-    this.menus = getMenuData();
+    this.menus = props.menuData;
     this.state = {
       openKeys: this.getDefaultCollapsedSubMenus(props),
     };
@@ -131,7 +129,7 @@ export default class SiderMenu extends PureComponent {
     });
   }
   render() {
-    const { collapsed, location: { pathname }, onCollapse } = this.props;
+    const { logo, collapsed, location: { pathname }, onCollapse } = this.props;
     const { openKeys } = this.state;
     // Don't show popup menu when it is been collapsed
     const menuProps = collapsed ? {} : {

+ 2 - 0
src/layouts/BasicLayout.js

@@ -129,6 +129,8 @@ class BasicLayout extends React.PureComponent {
     const layout = (
       <Layout>
         <SiderMenu
+          logo={logo}
+          menuData={getMenuData()}
           collapsed={collapsed}
           location={location}
           isMobile={this.state.isMobile}