fix: Context menu icons are lost when the main menu is hidden. (#230)

pull/3759/head
EdwinBetanc0urt 2020-01-20 16:12:26 -04:00 committed by Yamel Senih
parent 8e771a01e8
commit 171e54dda7
2 changed files with 20 additions and 10 deletions

View File

@ -57,7 +57,7 @@ export default {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'
}, },
templateDevice() { templateDevice() {
var template = 'contextMenuDesktop' let template = 'contextMenuDesktop'
if (this.isMobile) { if (this.isMobile) {
template = 'contextMenuMobile' template = 'contextMenuMobile'
} }
@ -67,7 +67,7 @@ export default {
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.el-submenu .el-menu-item { .el-submenu .el-menu-item {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
@ -79,7 +79,12 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
</style> </style>
<style> <style lang="scss">
// this forces to show the arrow icon when the main menu is hidden
#app .hideSidebar .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
display: initial;
}
.Run-Report { .Run-Report {
position: absolute; position: absolute;
right: 102%; right: 102%;

View File

@ -5,11 +5,13 @@
:index="item.meta.uuid" :index="item.meta.uuid"
@click="handleClick(item)" @click="handleClick(item)"
> >
<svg-icon v-if="isMobile" :icon-class="classIconMenuRight" /> {{ item.meta.title }} <svg-icon v-if="isMobile" :icon-class="classIconMenuRight" />
{{ item.meta.title }}
</el-menu-item> </el-menu-item>
<el-submenu v-else :index="item.meta.title" popper-append-to-body> <el-submenu v-else :index="item.meta.title" popper-append-to-body>
<template slot="title"> <template slot="title">
<svg-icon v-if="isMobile" icon-class="nested" /> {{ item.meta.title }} <svg-icon v-if="isMobile" icon-class="nested" />
{{ item.meta.title }}
</template> </template>
<item v-for="(child, key) in item.children" :key="key" :item="child"> <item v-for="(child, key) in item.children" :key="key" :item="child">
{{ child.meta.title }} {{ child.meta.title }}
@ -33,17 +35,20 @@ export default {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'
}, },
classIconMenuRight(iconMenu) { classIconMenuRight(iconMenu) {
var typeMenu = this.item.meta.type iconMenu = icon.find(element => {
iconMenu = icon.find(function(element) { return element.type === this.item.meta.type
return element.type === typeMenu
}) })
return iconMenu.icon return iconMenu.icon
} }
}, },
methods: { methods: {
handleClick(item) { handleClick(item) {
console.log(item) this.$router.push({
this.$router.push({ name: item.name, query: { tabParent: 0 }}) name: item.name,
query: {
tabParent: 0
}
})
} }
} }
} }