Merge branch 'hotfix/menu_item'

Former-commit-id: beafbd7
d2-projects · Sep 12, 2018 · 73a8c7a · 73a8c7a
2 parents e85058c + 43cc9d5
commit 73a8c7a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/src/layout/header-aside/components/components/menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue
@@ -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>

diff --git a/src/layout/header-aside/components/components/menu-sub/index.vue b/src/layout/header-aside/components/components/menu-sub/index.vue
@@ -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>