From e6fbdbd3225c5d66b846288ff52f4aa6d9e6a316 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sun, 22 Oct 2023 23:55:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E6=8A=98=E5=8F=A0/=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E4=BE=A7=E8=BE=B9=E6=A0=8F=E8=8F=9C=E5=8D=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 451a2f4b1f7300ab48cd049ceb362b53ea96692b
---
 src/components/Hamburger/index.vue            |  3 +-
 src/layout/components/Sidebar/Item.vue        | 28 +++++++------------
 src/layout/components/Sidebar/Link.vue        |  1 -
 src/layout/components/Sidebar/SidebarItem.vue |  2 +-
 src/styles/sidebar.scss                       | 13 +++++++++
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index a092d4f7..a9049d70 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -30,9 +30,10 @@ function toggleClick() {
 .hamburger {
   vertical-align: middle;
   cursor: pointer;
+  transform: scaleX(-1);
 }
 
 .hamburger.is-active {
-  transform: rotate(180deg);
+  transform: scaleX(1);
 }
 </style>
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index f4fb60ec..c25a033c 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -1,3 +1,13 @@
+<template>
+  <i
+    v-if="icon && icon.includes('el-icon')"
+    :class="icon"
+    class="sub-el-icon"
+  ></i>
+  <SvgIcon v-else-if="icon" :icon-class="icon" />
+  <span v-if="title">{{ translateRouteTitle(title) }}</span>
+</template>
+
 <script setup lang="ts">
 import SvgIcon from "@/components/SvgIcon/index.vue";
 import { translateRouteTitle } from "@/utils/i18n";
@@ -12,26 +22,8 @@ const props = defineProps({
     default: "",
   },
 });
-
-const vnodes: any[] = [];
-if (props.icon) {
-  if (props.icon.includes("el-icon")) {
-    vnodes.push(h("i", { class: [props.icon, "sub-el-icon"] }));
-  } else {
-    vnodes.push(h(SvgIcon, { "icon-class": props.icon }));
-  }
-}
-
-if (props.title) {
-  vnodes.push(h("span", { slot: "title" }, translateRouteTitle(props.title)));
-}
-const render = h("div", vnodes);
 </script>
 
-<template>
-  <render />
-</template>
-
 <style scoped>
 .sub-el-icon {
   width: 1em;
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index fb1516da..536a5d60 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import { computed } from "vue";
 import { isExternal } from "@/utils/index";
 import { useRouter } from "vue-router";
 
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 980dee69..5d64c7e6 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -84,7 +84,7 @@ function resolvePath(routePath: string) {
 </script>
 <template>
   <div v-if="!item.meta || !item.meta.hidden">
-    <!-- 无子路由 || 一个子路由（始终显示 alwaysShow = false 情况） -->
+    <!-- 无子路由 || 目录只有一个子路由并配置始终显示为否(alwaysShow=false) -->
     <template
       v-if="
         hasOneShowingChild(item.children, item) &&
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 9751ccab..62fe727e 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -119,6 +119,19 @@
           margin-left: 19px;
         }
       }
+
+      // TODO
+      & > .svg-icon {
+        margin: 0 auto;
+      }
+
+      & > span {
+        display: inline-block;
+        width: 0;
+        height: 0;
+        overflow: hidden;
+        visibility: hidden;
+      }
     }
 
     .el-sub-menu {