From b17bf99bf9ee89641038a4245576e2fdce475b62 Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Mon, 2 Nov 2020 22:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=96=20docs:=20update=20readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                   | 4 ++--
 README.zh-CN.md             | 4 ++--
 config/defaultSettings.ts   | 5 +----
 src/layouts/BasicLayout.tsx | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 4c713344..ccb39d04 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ An out-of-box UI solution for enterprise applications as a React boilerplate.
 - FAQ: http://pro.ant.design/docs/faq
 - Mirror Site in China: http://ant-design-pro.gitee.io
 
-## 4.0 Released Now! 🎉🎉🎉
+## 5.0 is ready for trial! 🎉🎉🎉
 
-[Announcing Ant Design Pro 4.0.0](https://medium.com/ant-design/ant-design-pro-v4-is-here-6f23098ae9d9)
+[Try Ant Design Pro 5.0.0](https://beta-pro.ant.design/docs/upgrade-v5-cn)
 
 ## Translation Recruitment :loudspeaker:
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index c59c31fe..af11590e 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -19,9 +19,9 @@
 - 常见问题：http://pro.ant.design/docs/faq-cn
 - 国内镜像：http://ant-design-pro.gitee.io
 
-## 现在我们发布了 4.0! 🎉🎉🎉
+## 5.0 已经可以试用了 ! 🎉🎉🎉
 
-[Announcing Ant Design Pro 4.0.0](https://zhuanlan.zhihu.com/p/67498559)
+[尝试 Ant Design Pro 5.0.0](https://beta-pro.ant.design/docs/upgrade-v5-cn)
 
 ## 特性
 
diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts
index 1f111286..dd2015b2 100644
--- a/config/defaultSettings.ts
+++ b/config/defaultSettings.ts
@@ -1,6 +1,6 @@
 import { Settings as ProSettings } from '@ant-design/pro-layout';
 
-type DefaultSettings = ProSettings & {
+type DefaultSettings = Partial<ProSettings> & {
   pwa: boolean;
 };
 
@@ -13,9 +13,6 @@ const proSettings: DefaultSettings = {
   fixedHeader: false,
   fixSiderbar: true,
   colorWeak: false,
-  menu: {
-    locale: true,
-  },
   title: 'Ant Design Pro',
   pwa: false,
   iconfontUrl: '',
diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index 5ee8b7e5..308f318c 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -131,6 +131,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
     <ProLayout
       logo={logo}
       formatMessage={formatMessage}
+      {...props}
+      {...settings}
       onCollapse={handleMenuCollapse}
       onMenuHeaderClick={() => history.push('/')}
       menuItemRender={(menuItemProps, defaultDom) => {
@@ -161,8 +163,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
         menuDataRef.current = menuData || [];
         return menuData || [];
       }}
-      {...props}
-      {...settings}
     >
       <Authorized authority={authorized!.authority} noMatch={noMatch}>
         {children}