sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/menu_icon' into develop

Browse Source 
Former-commit-id: f1bdd3318fb0e9ccfb8eb2ca35e8004af35bd180 [formerly b8898336829731bd73ebd079e51c08b5f3359925] [formerly f1bdd3318fb0e9ccfb8eb2ca35e8004af35bd180 [formerly b8898336829731bd73ebd079e51c08b5f3359925] [formerly f1bdd3318fb0e9ccfb8eb2ca35e8004af35bd180 [formerly b8898336829731bd73ebd079e51c08b5f3359925] [formerly b8898336829731bd73ebd079e51c08b5f3359925 [formerly dd5ae5aa6730474aabb9bbebfa6a0f91133f5b03 [formerly c1907c789a9005efd896848c52d01fe94fcda0dd]]]]]
Former-commit-id: d8a81a078c85ad307555675e0d97923cd83159a2
Former-commit-id: fe63ec71edfc37ff53b6300bec6eeee970c0f94c
Former-commit-id: c029193419c3d485a6fdf35b59139d6a4a492527 [formerly 4f32183c9ca83541b50f3e63782d0b5cfddfac8f]
Former-commit-id: 9be10d6bab2e651ed95f6bb9c3fa6666f670a156
Former-commit-id: 8458f972edcf1542e6567efe420ab8dd73eb9c27
Former-commit-id: 6f5c54f6cea7cd9c9d921dce2cfaf69d659d338b
Former-commit-id: a6bd16e28991fcbc752539fe3c796a552729de58
Former-commit-id: d85da1ce57a68a6e92e9cd416fe30d38120f672f
This commit is contained in:
liyang
2018-11-16 16:38:11 +08:00
parent 199e49799b 29cc7f3b00
commit 894ab29478
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "d2-admin",
"version": "1.6.1",
"version": "1.6.2",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",

2
src/layout/header-aside/components/components/menu-item/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<el-menu-item :index="menu.path || uniqueId">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
<i v-if="menu.icon === undefined" class="fa fa-file-o"></i>
<i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-file-o"></i>
<d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
<span slot="title">{{menu.title || '未命名菜单'}}</span>
</el-menu-item>

2
src/layout/header-aside/components/components/menu-sub/index.vue
View File

@@ -2,7 +2,7 @@
<el-submenu :index="menu.path || uniqueId">
<template slot="title">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
<i v-if="menu.icon === undefined" class="fa fa-folder-o"></i>
<i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-folder-o"></i>
<d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
<span slot="title">{{menu.title}}</span>
</template>