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

Merge branch 'hotfix/menu_item' into develop

Browse Source 
Former-commit-id: 572a17c4f8258e23f39ea41cd45e84c92199368c [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9] [formerly 572a17c4f8258e23f39ea41cd45e84c92199368c [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9] [formerly 572a17c4f8258e23f39ea41cd45e84c92199368c [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9] [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9 [formerly 5e3f904699ca3314363e651f6ce731e33fd8a04a [formerly 2eba1549f1ce31fa6d7119cf24a47b2a6338a7df]]]]]
Former-commit-id: 44550b2f83f2132db7fba2090f63eff47abbc9ce
Former-commit-id: 6e13dbb0b13200ddb95fa0e75d51fe3bd4f8b260
Former-commit-id: 075cd3ae90cb1f1e54664d5677ad3acae42329e2 [formerly 3ff0af7cb3ee4cd570b2a9704bf7aaedfb73ea4c]
Former-commit-id: 6ba2b694fc2dd9ca27fe9637dc85d090da97a732
Former-commit-id: 1b0d53e04c89f26fc02b2d9808af67e0ecffcdf7
Former-commit-id: 307eb1aa9e7fc571562ab12503f3f54afc94f329
Former-commit-id: c897630d55ff68df72c6ef3a2058a5a87bda6384
Former-commit-id: 9b6825bf7b8e4e3e01dbd3d2b0ae81ffd4275177
This commit is contained in:
liyang
2018-09-12 11:37:21 +08:00
parent 1f5dd5b64e 6959f7de01
commit 090a91c8ba
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> <template>
<el-menu-item :index="menu.path || uniqueId"> <el-menu-item :index="menu.path || uniqueId">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i> <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"/> <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg"/>
<i v-else class="fa fa-file-o"></i> <i v-else class="fa fa-file-o"></i>
<span slot="title">{{menu.title || '未命名菜单'}}</span> <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"> <el-submenu :index="menu.path || uniqueId">
<template slot="title"> <template slot="title">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i> <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"/> <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg"/>
<i v-else class="fa fa-folder-o"></i> <i v-else class="fa fa-folder-o"></i>
<span slot="title">{{menu.title}}</span> <span slot="title">{{menu.title}}</span>