github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'eleme/dev' into carbon

pull/6325/head
Leopoldthecoder 2017-08-05 18:36:14 +08:00
parent c20ff5e55c 418aef63a4
commit 1a1395aa8c
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/docs/en-US/menu.md
View File

@ -34,7 +34,7 @@
return { return {
activeIndex: '1', activeIndex: '1',
activeIndex2: '1', activeIndex2: '1',
isCollapse: false isCollapse: true
}; };
}, },
methods: { methods: {
@ -219,11 +219,18 @@ Vertical NavMenu could be collapsed.
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<style>
.el-menu-vertical-demo:not(.el-menu--collapse) {
width: 200px;
min-height: 400px;
}
</style>
<script> <script>
export default { export default {
data() { data() {
return { return {
isCollapse: false isCollapse: true
}; };
}, },
methods: { methods: {

9
examples/docs/zh-CN/menu.md
View File

@ -219,11 +219,18 @@
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<style>
.el-menu-vertical-demo:not(.el-menu--collapse) {
width: 200px;
min-height: 400px;
}
</style>
<script> <script>
export default { export default {
data() { data() {
return { return {
isCollapse: false isCollapse: true
}; };
}, },
methods: { methods: {

4
packages/cascader/src/menu.vue
View File

@ -81,7 +81,7 @@
} else { } else {
this.activeValue = [item.value]; this.activeValue = [item.value];
} }
this.$emit('pick', this.activeValue); this.$emit('pick', this.activeValue.slice());
}, },
handleMenuLeave() { handleMenuLeave() {
this.$emit('menuLeave'); this.$emit('menuLeave');
@ -91,7 +91,7 @@
this.activeValue.splice(menuIndex, len, item.value); this.activeValue.splice(menuIndex, len, item.value);
this.activeOptions.splice(menuIndex + 1, len, item.children); this.activeOptions.splice(menuIndex + 1, len, item.children);
if (this.changeOnSelect) { if (this.changeOnSelect) {
this.$emit('pick', this.activeValue, false); this.$emit('pick', this.activeValue.slice(), false);
} else { } else {
this.$emit('activeItemChange', this.activeValue); this.$emit('activeItemChange', this.activeValue);
} }