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 & { 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 = (props) => { history.push('/')} menuItemRender={(menuItemProps, defaultDom) => { @@ -161,8 +163,6 @@ const BasicLayout: React.FC = (props) => { menuDataRef.current = menuData || []; return menuData || []; }} - {...props} - {...settings} > {children}