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

Merge branch 'hotfix/menu_item'

Browse Source 
Former-commit-id: 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly aa45ad03140968da4068871111cb4882330c872d [formerly 54404d48557e469d1b08e62f8757abe8c8476849]]]]]
Former-commit-id: 73a8c7a64363b2136292f8e5c3ede24c86bb3ea3
Former-commit-id: 95ebe9abeea79ac38ed291633ac0e3ff58715206
Former-commit-id: f7e7b87bc5f78d3fac64d73c3dcb3684d2670119 [formerly 312ea8a9a303091767e46fe2ff9dfda117d1a93c]
Former-commit-id: 4eedd0c5b590af54cad38cacf9a295b3155650f8
Former-commit-id: 3b24d9d61a245e2d43d1a792cd641cddc6b7a9e4
Former-commit-id: 6f5ec3e281aed82f436d2211bb03929292a130ac
Former-commit-id: 8d7e4d3a7ab2a3a2a155b6fb682725ecad862712
Former-commit-id: c58b9e81c2fcf76799ca6abfd6766e0d7fe013ae
This commit is contained in:
liyang
2018-09-12 11:37:21 +08:00
parent d7949bfb34 6959f7de01
commit 9ed383a75d
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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