From d178aa9b60d64eded62d22fda7a90441b61750e5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 06:49:03 +0800
Subject: [PATCH] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarLogo.vue => AppLogo/index.vue}     |  0
 src/layouts/components/Sidebar/index.vue      | 48 -------------------
 src/layouts/views/LeftLayout.vue              | 26 ++++++++--
 src/layouts/views/MixLayout.vue               |  4 +-
 src/layouts/views/TopLayout.vue               |  4 +-
 5 files changed, 27 insertions(+), 55 deletions(-)
 rename src/layouts/components/{Sidebar/components/SidebarLogo.vue => AppLogo/index.vue} (100%)
 delete mode 100644 src/layouts/components/Sidebar/index.vue

diff --git a/src/layouts/components/Sidebar/components/SidebarLogo.vue b/src/layouts/components/AppLogo/index.vue
similarity index 100%
rename from src/layouts/components/Sidebar/components/SidebarLogo.vue
rename to src/layouts/components/AppLogo/index.vue
diff --git a/src/layouts/components/Sidebar/index.vue b/src/layouts/components/Sidebar/index.vue
deleted file mode 100644
index a022aeef..00000000
--- a/src/layouts/components/Sidebar/index.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <div :class="{ 'has-logo': showLogo }" class="layout-sidebar">
-    <!-- Logo -->
-    <SidebarLogo v-if="showLogo" :collapse="isCollapsed" />
-    <!-- 主菜单内容 -->
-    <slot></slot>
-  </div>
-</template>
-
-<script setup lang="ts">
-import SidebarLogo from "./components/SidebarLogo.vue";
-
-defineProps({
-  /**
-   * 是否显示Logo
-   */
-  showLogo: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 是否折叠
-   */
-  isCollapsed: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.layout-sidebar {
-  position: relative;
-  height: 100%;
-  background-color: var(--menu-background);
-  transition: width 0.28s;
-
-  &.has-logo {
-    .el-scrollbar {
-      height: calc(100vh - $navbar-height);
-    }
-  }
-
-  :deep(.el-menu) {
-    border: none;
-  }
-}
-</style>
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index 217cda53..455545d9 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -2,11 +2,14 @@
   <BaseLayout>
     <!-- 左侧菜单栏 -->
     <div class="layout__sidebar" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
-      <Sidebar :show-logo="isShowLogo" :is-collapsed="!isSidebarOpen">
+      <div :class="{ 'has-logo': isShowLogo }" class="layout-sidebar">
+        <!-- Logo -->
+        <AppLogo v-if="isShowLogo" :collapse="!isSidebarOpen" />
+        <!-- 主菜单内容 -->
         <el-scrollbar>
           <Menu :data="routes" base-path="" />
         </el-scrollbar>
-      </Sidebar>
+      </div>
     </div>
 
     <!-- 主内容区 -->
@@ -28,7 +31,7 @@
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import Sidebar from "../components/Sidebar/index.vue";
+import AppLogo from "../components/AppLogo/index.vue";
 import NavBar from "../components/NavBar/index.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
@@ -60,6 +63,23 @@ console.log("🔍 LeftLayout - isMobile:", isMobile.value);
     &--collapsed {
       width: $sidebar-width-collapsed;
     }
+
+    .layout-sidebar {
+      position: relative;
+      height: 100%;
+      background-color: var(--menu-background);
+      transition: width 0.28s;
+
+      &.has-logo {
+        .el-scrollbar {
+          height: calc(100vh - $navbar-height);
+        }
+      }
+
+      :deep(.el-menu) {
+        border: none;
+      }
+    }
   }
 
   &__main {
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 978439a2..fee46740 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -5,7 +5,7 @@
       <div class="layout__header-content">
         <!-- Logo区域 -->
         <div v-if="isShowLogo" class="layout__header-logo">
-          <SidebarLogo :collapse="false" />
+          <AppLogo :collapse="false" />
         </div>
 
         <!-- 顶部菜单区域 -->
@@ -63,7 +63,7 @@ import { useRoute } from "vue-router";
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
+import AppLogo from "../components/AppLogo/index.vue";
 import MixTopMenu from "../components/NavMenu/components/MixTopMenu.vue";
 import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index bb8cab78..f152bc83 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -4,7 +4,7 @@
     <div class="layout__header">
       <div class="layout__header-left">
         <!-- Logo -->
-        <SidebarLogo v-if="isShowLogo" :collapse="false" />
+        <AppLogo v-if="isShowLogo" :collapse="false" />
         <!-- 菜单 -->
         <Menu :data="routes" menu-mode="horizontal" base-path="" />
       </div>
@@ -26,7 +26,7 @@
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
+import AppLogo from "../components/AppLogo/index.vue";
 import Menu from "../components/NavMenu/index.vue";
 import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";