Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
d2f852a3
Commit
d2f852a3
authored
Dec 20, 2016
by
baiyaaaaa
Committed by
cinwell.li
Dec 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add dropdown hide-on-click prop
parent
98d3905c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
4 deletions
+46
-4
examples/docs/en-US/dropdown.md
examples/docs/en-US/dropdown.md
+1
-0
examples/docs/zh-CN/dropdown.md
examples/docs/zh-CN/dropdown.md
+1
-0
packages/dropdown/src/dropdown.vue
packages/dropdown/src/dropdown.vue
+8
-2
test/unit/specs/dropdown.spec.js
test/unit/specs/dropdown.spec.js
+36
-2
No files found.
examples/docs/en-US/dropdown.md
View file @
d2f852a3
...
@@ -113,6 +113,7 @@ Click the triggering element or hover on it.
...
@@ -113,6 +113,7 @@ Click the triggering element or hover on it.
| size | component size, refer to
`Button`
component | string | large, small, mini | — |
| size | component size, refer to
`Button`
component | string | large, small, mini | — |
| menu-align | horizontal alignment | string | start/end | end |
| menu-align | horizontal alignment | string | start/end | end |
| trigger | how to trigger | string | hover/click | hover |
| trigger | how to trigger | string | hover/click | hover |
| hide-on-click | whether to hide menu after clicking menu-item | boolean | - | true |
### Dropdown Events
### Dropdown Events
| Event Name | Description | Parameters |
| Event Name | Description | Parameters |
...
...
examples/docs/zh-CN/dropdown.md
View file @
d2f852a3
...
@@ -156,6 +156,7 @@
...
@@ -156,6 +156,7 @@
| split-button | 下拉触发元素呈现为按钮组 | boolean | — | false |
| split-button | 下拉触发元素呈现为按钮组 | boolean | — | false |
| menu-align | 菜单水平对齐方向 | string | start, end | end |
| menu-align | 菜单水平对齐方向 | string | start, end | end |
| trigger | 触发下拉的行为 | string | hover, click | hover |
| trigger | 触发下拉的行为 | string | hover, click | hover |
| hide-on-click | 是否在点击菜单项后隐藏菜单 | boolean | - | true |
### Dropdown Events
### Dropdown Events
| 事件名称 | 说明 | 回调参数 |
| 事件名称 | 说明 | 回调参数 |
...
...
packages/dropdown/src/dropdown.vue
View file @
d2f852a3
...
@@ -22,7 +22,11 @@
...
@@ -22,7 +22,11 @@
},
},
type
:
String
,
type
:
String
,
size
:
String
,
size
:
String
,
splitButton
:
Boolean
splitButton
:
Boolean
,
hideOnClick
:
{
type
:
Boolean
,
default
:
true
}
},
},
data
()
{
data
()
{
...
@@ -78,7 +82,9 @@
...
@@ -78,7 +82,9 @@
}
}
},
},
handleMenuItemClick
(
command
,
instance
)
{
handleMenuItemClick
(
command
,
instance
)
{
this
.
visible
=
false
;
if
(
this
.
hideOnClick
)
{
this
.
visible
=
false
;
}
this
.
$emit
(
'
command
'
,
command
,
instance
);
this
.
$emit
(
'
command
'
,
command
,
instance
);
}
}
},
},
...
...
test/unit/specs/dropdown.spec.js
View file @
d2f852a3
...
@@ -46,7 +46,7 @@ describe('Dropdown', () => {
...
@@ -46,7 +46,7 @@ describe('Dropdown', () => {
<span class="el-dropdown-link">
<span class="el-dropdown-link">
下拉菜单<i class="el-icon-caret-bottom el-icon-right"></i>
下拉菜单<i class="el-icon-caret-bottom el-icon-right"></i>
</span>
</span>
<el-dropdown-menu slot="dropdown"
class="dropdown-test-menu-click"
>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="a">黄金糕</el-dropdown-item>
<el-dropdown-item command="a">黄金糕</el-dropdown-item>
<el-dropdown-item command="b">狮子头</el-dropdown-item>
<el-dropdown-item command="b">狮子头</el-dropdown-item>
<el-dropdown-item ref="commandC" command="c">螺蛳粉</el-dropdown-item>
<el-dropdown-item ref="commandC" command="c">螺蛳粉</el-dropdown-item>
...
@@ -81,7 +81,7 @@ describe('Dropdown', () => {
...
@@ -81,7 +81,7 @@ describe('Dropdown', () => {
<span class="el-dropdown-link">
<span class="el-dropdown-link">
下拉菜单trigger click<i class="el-icon-caret-bottom el-icon-right"></i>
下拉菜单trigger click<i class="el-icon-caret-bottom el-icon-right"></i>
</span>
</span>
<el-dropdown-menu slot="dropdown"
class="dropdown-test-menu-click"
>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>黄金糕</el-dropdown-item>
<el-dropdown-item>黄金糕</el-dropdown-item>
<el-dropdown-item @click.native="handleClick">狮子头</el-dropdown-item>
<el-dropdown-item @click.native="handleClick">狮子头</el-dropdown-item>
<el-dropdown-item>螺蛳粉</el-dropdown-item>
<el-dropdown-item>螺蛳粉</el-dropdown-item>
...
@@ -147,4 +147,38 @@ describe('Dropdown', () => {
...
@@ -147,4 +147,38 @@ describe('Dropdown', () => {
},
300
);
},
300
);
},
300
);
},
300
);
});
});
it
(
'
hide on click
'
,
done
=>
{
vm
=
createVue
({
template
:
`
<el-dropdown ref="dropdown" :hide-on-click="false">
<span class="el-dropdown-link">
下拉菜单<i class="el-icon-caret-bottom el-icon-right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="a">黄金糕</el-dropdown-item>
<el-dropdown-item command="b">狮子头</el-dropdown-item>
<el-dropdown-item ref="commandC" command="c">螺蛳粉</el-dropdown-item>
<el-dropdown-item command="d">双皮奶</el-dropdown-item>
<el-dropdown-item command="e">蚵仔煎</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
`
},
true
);
let
dropdown
=
vm
.
$refs
.
dropdown
;
let
dropdownElm
=
dropdown
.
$el
;
let
triggerElm
=
dropdownElm
.
children
[
0
];
let
callback
=
sinon
.
spy
();
dropdown
.
$on
(
'
command
'
,
callback
);
triggerEvent
(
triggerElm
,
'
mouseenter
'
);
setTimeout
(
_
=>
{
vm
.
$refs
.
commandC
.
$el
.
click
();
setTimeout
(
_
=>
{
expect
(
dropdown
.
visible
).
to
.
true
;
expect
(
callback
.
calledWith
(
'
c
'
)).
to
.
be
.
true
;
done
();
},
300
);
},
300
);
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment