File tree 4 files changed +7
-10
lines changed
4 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -21,9 +21,9 @@ An out-of-box UI solution for enterprise applications as a React boilerplate.
21
21
- FAQ: http://pro.ant.design/docs/faq
22
22
- Mirror Site in China: http://ant-design-pro.gitee.io
23
23
24
- ## 4 .0 Released Now ! 🎉🎉🎉
24
+ ## 5 .0 is ready for trial ! 🎉🎉🎉
25
25
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 )
27
27
28
28
## Translation Recruitment :loudspeaker :
29
29
Original file line number Diff line number Diff line change 19
19
- 常见问题:http://pro.ant.design/docs/faq-cn
20
20
- 国内镜像:http://ant-design-pro.gitee.io
21
21
22
- ## 现在我们发布了 4.0 ! 🎉🎉🎉
22
+ ## 5.0 已经可以试用了 ! 🎉🎉🎉
23
23
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 )
25
25
26
26
## 特性
27
27
Original file line number Diff line number Diff line change 1
1
import { Settings as ProSettings } from '@ant-design/pro-layout' ;
2
2
3
- type DefaultSettings = ProSettings & {
3
+ type DefaultSettings = Partial < ProSettings > & {
4
4
pwa : boolean ;
5
5
} ;
6
6
@@ -13,9 +13,6 @@ const proSettings: DefaultSettings = {
13
13
fixedHeader : false ,
14
14
fixSiderbar : true ,
15
15
colorWeak : false ,
16
- menu : {
17
- locale : true ,
18
- } ,
19
16
title : 'Ant Design Pro' ,
20
17
pwa : false ,
21
18
iconfontUrl : '' ,
Original file line number Diff line number Diff line change @@ -131,6 +131,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
131
131
< ProLayout
132
132
logo = { logo }
133
133
formatMessage = { formatMessage }
134
+ { ...props }
135
+ { ...settings }
134
136
onCollapse = { handleMenuCollapse }
135
137
onMenuHeaderClick = { ( ) => history . push ( '/' ) }
136
138
menuItemRender = { ( menuItemProps , defaultDom ) => {
@@ -161,8 +163,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
161
163
menuDataRef . current = menuData || [ ] ;
162
164
return menuData || [ ] ;
163
165
} }
164
- { ...props }
165
- { ...settings }
166
166
>
167
167
< Authorized authority = { authorized ! . authority } noMatch = { noMatch } >
168
168
{ children }
You can’t perform that action at this time.
0 commit comments