Compare commits

..

No commits in common. "bf3579728203477bc93196e09bf5b46ecce74140" and "47798750a4ab7216cdeb8a5a8138cfcaf5cfc5fc" have entirely different histories.

3 changed files with 5 additions and 18 deletions

View File

@ -2,17 +2,9 @@
<el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right"> <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right">
<transition-group name="breadcrumb"> <transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path"> <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect"> <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
<!-- {{ item.meta.title }} --> <span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">{{ item.meta.title }}</span>
{{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }} <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
</span>
<span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">
<!-- {{ item.meta.title }} -->
{{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
</span>
<a v-else @click.prevent="handleLink(item)">
{{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
</a>
</el-breadcrumb-item> </el-breadcrumb-item>
</transition-group> </transition-group>
</el-breadcrumb> </el-breadcrumb>
@ -43,7 +35,6 @@ export default {
item.meta.title = this.$route.query.trialCode // item.meta.title = this.$route.query.trialCode //
} }
}) })
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
}, },
isDashboard(route) { isDashboard(route) {

View File

@ -3,16 +3,14 @@
<template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"> <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
<app-link v-if="!onlyOneChild.hidden" :to="resolvePath(onlyOneChild.path)"> <app-link v-if="!onlyOneChild.hidden" :to="resolvePath(onlyOneChild.path)">
<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" @click="handleClick(onlyOneChild.meta.title)"> <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" @click="handleClick(onlyOneChild.meta.title)">
<!-- :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" --> <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" />
<item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta.i18n ? $t(onlyOneChild.meta.i18n) : null" />
</el-menu-item> </el-menu-item>
</app-link> </app-link>
</template> </template>
<el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body> <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
<template slot="title"> <template slot="title">
<!-- :title="item.meta.title" --> <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
<item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.i18n ? $t(item.meta.i18n) : null" />
</template> </template>
<sidebar-item <sidebar-item
v-for="child in item.children" v-for="child in item.children"

View File

@ -39,8 +39,6 @@ function filterAsyncRouter(asyncRouterMap = [], lastRouter = false, type = false
// eslint-disable-next-line // eslint-disable-next-line
route.meta = eval('(' + route.Meta + ')') route.meta = eval('(' + route.Meta + ')')
route.meta.icon = route.MenuIcon route.meta.icon = route.MenuIcon
route.meta.i18n = route.LanguageMark
console.log(route.LanguageMark)
delete route.Meta delete route.Meta
} }
delete route.MenuIcon delete route.MenuIcon