Commit 1a1395aa authored by Leopoldthecoder's avatar Leopoldthecoder

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

parents c20ff5e5 418aef63
...@@ -34,7 +34,7 @@ ...@@ -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. ...@@ -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: {
......
...@@ -219,11 +219,18 @@ ...@@ -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: {
......
...@@ -81,7 +81,7 @@ ...@@ -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 @@ ...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment