From 3fde5aaa3c286dc69130bdf9c8ed0561c0a02d94 Mon Sep 17 00:00:00 2001
From: liutsing <liutsingluo@163.com>
Date: Fri, 16 Feb 2018 01:22:44 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=AC=E5=9C=B0=E5=8C=96=202?=
 =?UTF-8?q?=E3=80=81=E8=A7=A3=E5=86=B3=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=E6=97=B6=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E4=B8=8B=E6=97=A0=E8=8F=9C=E5=8D=95=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/Menu.js | 4 ++--
 src/router.js                 | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js
index 257df2a..1a2b8e4 100644
--- a/src/components/Layout/Menu.js
+++ b/src/components/Layout/Menu.js
@@ -31,9 +31,9 @@ const Menus = ({ siderFold, darkTheme, navOpenKeys, changeOpenKeys, menu, locati
       }
       return (
         <Menu.Item key={item.id}>
-          <Link to={item.route || '#'}>
+          <Link to={item.route || '#'} style={siderFoldN ? {width: 10} : {}}>
             {item.icon && <Icon type={item.icon} />}
-            {(!siderFoldN || !menuTree.includes(item)) && item.name}
+            <span>{item.name}</span>
           </Link>
         </Menu.Item>
       )
diff --git a/src/router.js b/src/router.js
index 06e2441..b027f09 100644
--- a/src/router.js
+++ b/src/router.js
@@ -3,6 +3,9 @@ import PropTypes from 'prop-types'
 import { Switch, Route, Redirect, routerRedux } from 'dva/router'
 import dynamic from 'dva/dynamic'
 import App from 'routes/app'
+import {LocaleProvider} from 'antd';
+import zh_CN from 'antd/lib/locale-provider/zh_CN';
+import 'moment/locale/zh-cn';
 
 const { ConnectedRouter } = routerRedux
 
@@ -67,6 +70,7 @@ const Routers = function ({ history, app }) {
 
   return (
     <ConnectedRouter history={history}>
+      <LocaleProvider locale={zh_CN}>
       <App>
         <Switch>
           <Route exact path="/" render={() => (<Redirect to="/dashboard" />)} />
@@ -85,6 +89,7 @@ const Routers = function ({ history, app }) {
           <Route component={error} />
         </Switch>
       </App>
+      </LocaleProvider>
     </ConnectedRouter>
   )
 }