Skip to content

Commit b17bf99

Browse files
committed
📖 docs: update readme
1 parent 992ef63 commit b17bf99

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ An out-of-box UI solution for enterprise applications as a React boilerplate.
2121
- FAQ: http://pro.ant.design/docs/faq
2222
- Mirror Site in China: http://ant-design-pro.gitee.io
2323

24-
## 4.0 Released Now! 🎉🎉🎉
24+
## 5.0 is ready for trial! 🎉🎉🎉
2525

26-
[Announcing Ant Design Pro 4.0.0](https://medium.com/ant-design/ant-design-pro-v4-is-here-6f23098ae9d9)
26+
[Try Ant Design Pro 5.0.0](https://beta-pro.ant.design/docs/upgrade-v5-cn)
2727

2828
## Translation Recruitment :loudspeaker:
2929

Diff for: README.zh-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
- 常见问题:http://pro.ant.design/docs/faq-cn
2020
- 国内镜像:http://ant-design-pro.gitee.io
2121

22-
## 现在我们发布了 4.0! 🎉🎉🎉
22+
## 5.0 已经可以试用了 ! 🎉🎉🎉
2323

24-
[Announcing Ant Design Pro 4.0.0](https://zhuanlan.zhihu.com/p/67498559)
24+
[尝试 Ant Design Pro 5.0.0](https://beta-pro.ant.design/docs/upgrade-v5-cn)
2525

2626
## 特性
2727

Diff for: config/defaultSettings.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Settings as ProSettings } from '@ant-design/pro-layout';
22

3-
type DefaultSettings = ProSettings & {
3+
type DefaultSettings = Partial<ProSettings> & {
44
pwa: boolean;
55
};
66

@@ -13,9 +13,6 @@ const proSettings: DefaultSettings = {
1313
fixedHeader: false,
1414
fixSiderbar: true,
1515
colorWeak: false,
16-
menu: {
17-
locale: true,
18-
},
1916
title: 'Ant Design Pro',
2017
pwa: false,
2118
iconfontUrl: '',

Diff for: src/layouts/BasicLayout.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
131131
<ProLayout
132132
logo={logo}
133133
formatMessage={formatMessage}
134+
{...props}
135+
{...settings}
134136
onCollapse={handleMenuCollapse}
135137
onMenuHeaderClick={() => history.push('/')}
136138
menuItemRender={(menuItemProps, defaultDom) => {
@@ -161,8 +163,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
161163
menuDataRef.current = menuData || [];
162164
return menuData || [];
163165
}}
164-
{...props}
165-
{...settings}
166166
>
167167
<Authorized authority={authorized!.authority} noMatch={noMatch}>
168168
{children}

0 commit comments

Comments
 (0)