Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
0a689592
A
ant-design
项目概览
wanjj_1210
/
ant-design
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0a689592
编写于
1月 16, 2017
作者:
偏
偏右
提交者:
Wei Zhu
1月 16, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix openKeys and defaultOpenKeys of Menu, close #3783 (#4609)
上级
d0ddf94d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
98 addition
and
6 deletion
+98
-6
components/menu/__tests__/index.test.js
components/menu/__tests__/index.test.js
+85
-0
components/menu/demo/switch-mode.md
components/menu/demo/switch-mode.md
+1
-0
components/menu/index.tsx
components/menu/index.tsx
+12
-6
未找到文件。
components/menu/__tests__/index.test.js
0 → 100644
浏览文件 @
0a689592
import
React
from
'
react
'
;
import
{
mount
}
from
'
enzyme
'
;
import
Menu
from
'
..
'
;
const
SubMenu
=
Menu
.
SubMenu
;
describe
(
'
Menu
'
,
()
=>
{
it
(
'
should accept defaultOpenKeys in mode horizontal
'
,
()
=>
{
const
wrapper
=
mount
(
<
Menu
defaultOpenKeys
=
{[
'
1
'
]}
mode
=
"
horizontal
"
>
<
SubMenu
key
=
"
1
"
title
=
"
submenu1
"
>
<
Menu
.
Item
key
=
"
submenu1
"
>
Option
1
<
/Menu.Item
>
<
Menu
.
Item
key
=
"
submenu2
"
>
Option
2
<
/Menu.Item
>
<
/SubMenu
>
<
Menu
.
Item
key
=
"
2
"
>
menu2
<
/Menu.Item
>
<
/Menu
>
);
expect
(
wrapper
.
find
(
'
.ant-menu-sub
'
).
at
(
0
).
hasClass
(
'
ant-menu-hidden
'
)).
not
.
toBe
(
true
);
});
it
(
'
should accept defaultOpenKeys in mode inline
'
,
()
=>
{
const
wrapper
=
mount
(
<
Menu
defaultOpenKeys
=
{[
'
1
'
]}
mode
=
"
inline
"
>
<
SubMenu
key
=
"
1
"
title
=
"
submenu1
"
>
<
Menu
.
Item
key
=
"
submenu1
"
>
Option
1
<
/Menu.Item
>
<
Menu
.
Item
key
=
"
submenu2
"
>
Option
2
<
/Menu.Item
>
<
/SubMenu
>
<
Menu
.
Item
key
=
"
2
"
>
menu2
<
/Menu.Item
>
<
/Menu
>
);
expect
(
wrapper
.
find
(
'
.ant-menu-sub
'
).
at
(
0
).
hasClass
(
'
ant-menu-hidden
'
)).
not
.
toBe
(
true
);
});
it
(
'
should accept defaultOpenKeys in mode vertical
'
,
()
=>
{
const
wrapper
=
mount
(
<
Menu
defaultOpenKeys
=
{[
'
1
'
]}
mode
=
"
vertical
"
>
<
SubMenu
key
=
"
1
"
title
=
"
submenu1
"
>
<
Menu
.
Item
key
=
"
submenu1
"
>
Option
1
<
/Menu.Item
>
<
Menu
.
Item
key
=
"
submenu2
"
>
Option
2
<
/Menu.Item
>
<
/SubMenu
>
<
Menu
.
Item
key
=
"
2
"
>
menu2
<
/Menu.Item
>
<
/Menu
>
);
expect
(
wrapper
.
find
(
'
.ant-menu-sub
'
).
at
(
0
).
hasClass
(
'
ant-menu-hidden
'
)).
not
.
toBe
(
true
);
});
it
(
'
should accept openKeys in mode horizontal
'
,
()
=>
{
const
wrapper
=
mount
(
<
Menu
openKeys
=
{[
'
1
'
]}
mode
=
"
horizontal
"
>
<
SubMenu
key
=
"
1
"
title
=
"
submenu1
"
>
<
Menu
.
Item
key
=
"
submenu1
"
>
Option
1
<
/Menu.Item
>
<
Menu
.
Item
key
=
"
submenu2
"
>
Option
2
<
/Menu.Item
>
<
/SubMenu
>
<
Menu
.
Item
key
=
"
2
"
>
menu2
<
/Menu.Item
>
<
/Menu
>
);
expect
(
wrapper
.
find
(
'
.ant-menu-sub
'
).
at
(
0
).
hasClass
(
'
ant-menu-hidden
'
)).
not
.
toBe
(
true
);
});
it
(
'
should accept openKeys in mode inline
'
,
()
=>
{
const
wrapper
=
mount
(
<
Menu
openKeys
=
{[
'
1
'
]}
mode
=
"
inline
"
>
<
SubMenu
key
=
"
1
"
title
=
"
submenu1
"
>
<
Menu
.
Item
key
=
"
submenu1
"
>
Option
1
<
/Menu.Item
>
<
Menu
.
Item
key
=
"
submenu2
"
>
Option
2
<
/Menu.Item
>
<
/SubMenu
>
<
Menu
.
Item
key
=
"
2
"
>
menu2
<
/Menu.Item
>
<
/Menu
>
);
expect
(
wrapper
.
find
(
'
.ant-menu-sub
'
).
at
(
0
).
hasClass
(
'
ant-menu-hidden
'
)).
not
.
toBe
(
true
);
});
it
(
'
should accept openKeys in mode vertical
'
,
()
=>
{
const
wrapper
=
mount
(
<
Menu
openKeys
=
{[
'
1
'
]}
mode
=
"
vertical
"
>
<
SubMenu
key
=
"
1
"
title
=
"
submenu1
"
>
<
Menu
.
Item
key
=
"
submenu1
"
>
Option
1
<
/Menu.Item
>
<
Menu
.
Item
key
=
"
submenu2
"
>
Option
2
<
/Menu.Item
>
<
/SubMenu
>
<
Menu
.
Item
key
=
"
2
"
>
menu2
<
/Menu.Item
>
<
/Menu
>
);
expect
(
wrapper
.
find
(
'
.ant-menu-sub
'
).
at
(
0
).
hasClass
(
'
ant-menu-hidden
'
)).
not
.
toBe
(
true
);
});
});
components/menu/demo/switch-mode.md
浏览文件 @
0a689592
...
@@ -69,5 +69,6 @@ const Sider = React.createClass({
...
@@ -69,5 +69,6 @@ const Sider = React.createClass({
);
);
},
},
});
});
ReactDOM
.
render
(<
Sider
/>,
mountNode
);
ReactDOM
.
render
(<
Sider
/>,
mountNode
);
````
````
components/menu/index.tsx
浏览文件 @
0a689592
...
@@ -71,8 +71,15 @@ export default class Menu extends React.Component<MenuProps, any> {
...
@@ -71,8 +71,15 @@ export default class Menu extends React.Component<MenuProps, any> {
'
see: http://u.ant.design/menu-on-open-change.
'
'
see: http://u.ant.design/menu-on-open-change.
'
);
);
let
openKeys
;
if
(
'
defaultOpenKeys
'
in
props
)
{
openKeys
=
props
.
defaultOpenKeys
;
}
else
if
(
'
openKeys
'
in
props
)
{
openKeys
=
props
.
openKeys
;
}
this
.
state
=
{
this
.
state
=
{
openKeys
:
[]
,
openKeys
,
};
};
}
}
componentWillReceiveProps
(
nextProps
)
{
componentWillReceiveProps
(
nextProps
)
{
...
@@ -87,7 +94,7 @@ export default class Menu extends React.Component<MenuProps, any> {
...
@@ -87,7 +94,7 @@ export default class Menu extends React.Component<MenuProps, any> {
handleClick
=
(
e
)
=>
{
handleClick
=
(
e
)
=>
{
this
.
setOpenKeys
([]);
this
.
setOpenKeys
([]);
const
onClick
=
this
.
props
.
onClick
;
const
{
onClick
}
=
this
.
props
;
if
(
onClick
)
{
if
(
onClick
)
{
onClick
(
e
);
onClick
(
e
);
}
}
...
@@ -95,7 +102,7 @@ export default class Menu extends React.Component<MenuProps, any> {
...
@@ -95,7 +102,7 @@ export default class Menu extends React.Component<MenuProps, any> {
handleOpenChange
=
(
openKeys
:
string
[])
=>
{
handleOpenChange
=
(
openKeys
:
string
[])
=>
{
this
.
setOpenKeys
(
openKeys
);
this
.
setOpenKeys
(
openKeys
);
const
onOpenChange
=
this
.
props
.
onOpenChange
;
const
{
onOpenChange
}
=
this
.
props
;
if
(
onOpenChange
)
{
if
(
onOpenChange
)
{
onOpenChange
(
openKeys
);
onOpenChange
(
openKeys
);
}
}
...
@@ -132,9 +139,8 @@ export default class Menu extends React.Component<MenuProps, any> {
...
@@ -132,9 +139,8 @@ export default class Menu extends React.Component<MenuProps, any> {
let
props
=
{};
let
props
=
{};
const
className
=
`
${
this
.
props
.
className
}
${
this
.
props
.
prefixCls
}
-
${
this
.
props
.
theme
}
`
;
const
className
=
`
${
this
.
props
.
className
}
${
this
.
props
.
prefixCls
}
-
${
this
.
props
.
theme
}
`
;
if
(
this
.
props
.
mode
!==
'
inline
'
)
{
if
(
this
.
props
.
mode
!==
'
inline
'
)
{
// 这组属性的目的是
// There is this.state.openKeys for
// 弹出型的菜单需要点击后立即关闭
// closing vertical popup submenu after click it
// 另外,弹出型的菜单的受控模式没有使用场景
props
=
{
props
=
{
openKeys
:
this
.
state
.
openKeys
,
openKeys
:
this
.
state
.
openKeys
,
onClick
:
this
.
handleClick
,
onClick
:
this
.
handleClick
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录