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
1a1395aa
Commit
1a1395aa
authored
Aug 05, 2017
by
Leopoldthecoder
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'eleme/dev' into carbon
parents
c20ff5e5
418aef63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
examples/docs/en-US/menu.md
examples/docs/en-US/menu.md
+9
-2
examples/docs/zh-CN/menu.md
examples/docs/zh-CN/menu.md
+8
-1
packages/cascader/src/menu.vue
packages/cascader/src/menu.vue
+2
-2
No files found.
examples/docs/en-US/menu.md
View file @
1a1395aa
...
...
@@ -34,7 +34,7 @@
return {
activeIndex: '1',
activeIndex2: '1',
isCollapse:
fals
e
isCollapse:
tru
e
};
},
methods: {
...
...
@@ -219,11 +219,18 @@ Vertical NavMenu could be collapsed.
</el-menu-item>
</el-menu>
<style>
.el-menu-vertical-demo
:not
(
.el-menu--collapse
)
{
width
:
200px
;
min-height
:
400px
;
}
</style>
<script>
export
default
{
data
()
{
return
{
isCollapse
:
fals
e
isCollapse
:
tru
e
};
},
methods
:
{
...
...
examples/docs/zh-CN/menu.md
View file @
1a1395aa
...
...
@@ -219,11 +219,18 @@
</el-menu-item>
</el-menu>
<style>
.el-menu-vertical-demo
:not
(
.el-menu--collapse
)
{
width
:
200px
;
min-height
:
400px
;
}
</style>
<script>
export
default
{
data
()
{
return
{
isCollapse
:
fals
e
isCollapse
:
tru
e
};
},
methods
:
{
...
...
packages/cascader/src/menu.vue
View file @
1a1395aa
...
...
@@ -81,7 +81,7 @@
}
else
{
this
.
activeValue
=
[
item
.
value
];
}
this
.
$emit
(
'
pick
'
,
this
.
activeValue
);
this
.
$emit
(
'
pick
'
,
this
.
activeValue
.
slice
()
);
},
handleMenuLeave
()
{
this
.
$emit
(
'
menuLeave
'
);
...
...
@@ -91,7 +91,7 @@
this
.
activeValue
.
splice
(
menuIndex
,
len
,
item
.
value
);
this
.
activeOptions
.
splice
(
menuIndex
+
1
,
len
,
item
.
children
);
if
(
this
.
changeOnSelect
)
{
this
.
$emit
(
'
pick
'
,
this
.
activeValue
,
false
);
this
.
$emit
(
'
pick
'
,
this
.
activeValue
.
slice
()
,
false
);
}
else
{
this
.
$emit
(
'
activeItemChange
'
,
this
.
activeValue
);
}
...
...
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