From 17615c4f4924ed88b3a7482ef89a5d92e6c89a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E9=83=A1?= <95609658@qq.com>
Date: Fri, 17 Jan 2020 10:21:20 +0800
Subject: [PATCH] chore: render standard html tag in sidebar menu

---
 src/layout/components/Sidebar/Link.vue        |  1 +
 src/layout/components/Sidebar/SidebarItem.vue | 35 ++++++++++++-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index eb4dd107..ba6d87c7 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -3,6 +3,7 @@
   <!-- eslint-disable vue/require-component-is -->
   <component v-bind="linkProps(to)">
     <slot />
+    <slot name="title" />
   </component>
 </template>
 
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index a418c3d7..3a735d32 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,14 +1,16 @@
 <template>
-  <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </app-link>
-    </template>
-
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+  <!-- render tag rightly -->
+  <component
+    :is="!appLinkShow?'el-submenu':'el-menu-item'"
+    v-if="!item.hidden"
+    :ref="!appLinkShow?'subMenu':''"
+    :index="resolvePath(item.path)"
+    popper-append-to-body
+  >
+    <app-link v-if="appLinkShow" :to="resolvePath(onlyOneChild.path)">
+      <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+    </app-link>
+    <template v-else>
       <template slot="title">
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
@@ -20,8 +22,8 @@
         :base-path="resolvePath(child.path)"
         class="nest-menu"
       />
-    </el-submenu>
-  </div>
+    </template>
+  </component>
 </template>
 
 <script>
@@ -56,6 +58,15 @@ export default {
     this.onlyOneChild = null
     return {}
   },
+  computed: {
+    appLinkShow() {
+      return (
+        this.hasOneShowingChild(this.item.children, this.item) &&
+        (!this.onlyOneChild.children || this.onlyOneChild.noShowingChildren) &&
+        !this.item.alwaysShow
+      )
+    }
+  },
   methods: {
     hasOneShowingChild(children = [], parent) {
       const showingChildren = children.filter(item => {