diff --git a/src/components/layout/main.less b/src/components/layout/main.less index 885202b..75b40d9 100644 --- a/src/components/layout/main.less +++ b/src/components/layout/main.less @@ -5,6 +5,10 @@ height: 100vh; min-width: 1200px; + &.fold{ + color: #666; + } + .sider { width: 224px; background: #404040; diff --git a/src/components/layout/sider.jsx b/src/components/layout/sider.jsx index 38f4af0..11519ac 100644 --- a/src/components/layout/sider.jsx +++ b/src/components/layout/sider.jsx @@ -26,14 +26,18 @@ const getMenus = function (menuArray, parentPath) { }) } -function Sider({ location }) { +function Sider({ location,siderFold }) { + console.log(location,siderFold); return (
{config.logoText}
- + {getMenus(menu)}
@@ -42,6 +46,7 @@ function Sider({ location }) { Sider.propTypes = { location: PropTypes.object, + siderFold: PropTypes.bool, } export default Sider diff --git a/src/models/app.js b/src/models/app.js index 7957b07..46f6321 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -10,7 +10,8 @@ export default { user: { name: "吴彦祖" }, - loginButtonLoading: false + loginButtonLoading: false, + siderFold:true }, subscriptions : { setup({dispatch}) { diff --git a/src/routes/app.js b/src/routes/app.js index ddf2723..cd7b086 100644 --- a/src/routes/app.js +++ b/src/routes/app.js @@ -1,6 +1,5 @@ import React, {PropTypes} from 'react' import {connect} from 'dva' -import classnames from 'classnames' import Login from './login' import Header from '../components/layout/header' import Bread from '../components/layout/bread' @@ -8,10 +7,11 @@ import Footer from '../components/layout/footer' import Sider from '../components/layout/sider' import styles from '../components/layout/main.less' import {Spin,message} from 'antd' +import {classnames} from '../utils' import '../components/layout/common.less' function App({children, location, dispatch, app}) { - const {login, loading, loginButtonLoading, user} = app + const {login, loading, loginButtonLoading, user, siderFold} = app const loginProps = { loading, loginButtonLoading, @@ -28,9 +28,13 @@ function App({children, location, dispatch, app}) { } } + const siderProps = { + siderFold, + } + return (
{login - ?
+ ?
@@ -56,11 +60,8 @@ App.propTypes = { loading: PropTypes.object, loginButtonLoading: PropTypes.bool, login: PropTypes.bool, - user: PropTypes.object + user: PropTypes.object, + siderFold:PropTypes.bool, } -function mapStateToProps({app}) { - return {app} -} - -export default connect(mapStateToProps)(App) +export default connect(({app}) => ({app}))(App) diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js index 0054bb9..e62e75f 100644 --- a/src/routes/dashboard.js +++ b/src/routes/dashboard.js @@ -55,10 +55,10 @@ function Dashboard() { - + - + diff --git a/src/utils/index.js b/src/utils/index.js index a75be9e..094b9ee 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,6 +1,7 @@ import config from './config' import menu from './menu' import request from './request' +import classnames from 'classnames' import {color} from './theme' require('./mock.js') @@ -20,5 +21,6 @@ module.exports = { config, menu, request, - color + color, + classnames, }