Merge branch 'hotfix/menu_icon'

Former-commit-id: 93f98b979c3a5aa49f6d31e377fd6571bc29b0d2 [formerly 93f98b979c3a5aa49f6d31e377fd6571bc29b0d2 [formerly 93f98b979c3a5aa49f6d31e377fd6571bc29b0d2 [formerly 93f98b979c3a5aa49f6d31e377fd6571bc29b0d2 [formerly 6759319 [formerly 32c8244fb4248cc27876a5f6857663f3680ee1ba]]]]]
Former-commit-id: ec7e6fd
Former-commit-id: 1fb3339
Former-commit-id: 178a12cbe0a92826d4523f91558735f8f85576de [formerly bf90d42c4b4b8f8317d39d55c5a4c2d215b861d2]
Former-commit-id: ae42b31949da0e87c49f310cbafe29571339f604
Former-commit-id: 56a49e6e6e30e81323a58cc9aff2c03525a08b6f
Former-commit-id: 8c20e8f5acd118d2e3d233f58501dd2dce5f0eb3
Former-commit-id: 368ad9e5b07fbcf8c363f414ae884587d07923c1
Former-commit-id: e3f00cf35c3e94799230cf2e1ac8cb2c8c6c0fff

package.json

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

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

@@ -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>

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

@@ -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>