From 265257294b44b8ee31069a8ace3eed8175bae275 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 14 Sep 2025 21:22:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/AppMain/index.vue      |  5 ++
 src/layouts/index.vue                         | 54 ++++++++-----------
 src/layouts/layouts/BaseLayout.vue            | 41 --------------
 src/layouts/modes/index.vue                   | 47 ++++++++++++++++
 .../LeftLayout.vue => modes/left/index.vue}   | 12 ++---
 .../MixLayout.vue => modes/mix/index.vue}     | 32 ++++-------
 .../TopLayout.vue => modes/top/index.vue}     | 14 +++--
 src/router/index.ts                           |  2 +-
 src/store/modules/permission-store.ts         |  2 +-
 9 files changed, 98 insertions(+), 111 deletions(-)
 delete mode 100644 src/layouts/layouts/BaseLayout.vue
 create mode 100644 src/layouts/modes/index.vue
 rename src/layouts/{layouts/LeftLayout.vue => modes/left/index.vue} (88%)
 rename src/layouts/{layouts/MixLayout.vue => modes/mix/index.vue} (88%)
 rename src/layouts/{layouts/TopLayout.vue => modes/top/index.vue} (88%)

diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index 1ec6249c..2ab669b6 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -9,6 +9,11 @@
         </transition>
       </template>
     </router-view>
+
+    <!-- 返回顶部按钮 -->
+    <el-backtop target=".app-main">
+      <div class="i-svg:backtop w-6 h-6" />
+    </el-backtop>
   </section>
 </template>
 
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index d5e28f63..ec5fe380 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,48 +1,36 @@
 <template>
-  <div class="layout-wrapper">
-    <component :is="currentLayoutComponent" />
+  <div class="layout" :class="layoutClass">
+    <!-- 移动端遮罩层 -->
+    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
 
-    <!-- 设置面板 - 独立于布局组件 -->
-    <Settings v-if="isShowSettings" />
+    <!-- 布局内容插槽 -->
+    <slot></slot>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
-import { useRoute } from "vue-router";
-import { useLayout } from "@/composables/layout/useLayout";
-import LeftLayout from "./views/LeftLayout.vue";
-import TopLayout from "./views/TopLayout.vue";
-import MixLayout from "./views/MixLayout.vue";
-import Settings from "./components/Settings/index.vue";
-import { LayoutMode } from "@/enums/settings/layout.enum";
-import { defaultSettings } from "@/settings";
+import { useLayout, useLayoutResponsive } from "@/composables";
 
-const { currentLayout } = useLayout();
-const route = useRoute();
+// 布局相关
+const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
 
-// 根据当前布局模式选择对应的组件
-const currentLayoutComponent = computed(() => {
-  const override = route.meta?.layout as LayoutMode | undefined;
-  const layoutToUse = override ?? currentLayout.value;
-  switch (layoutToUse) {
-    case LayoutMode.TOP:
-      return TopLayout;
-    case LayoutMode.MIX:
-      return MixLayout;
-    case LayoutMode.LEFT:
-    default:
-      return LeftLayout;
-  }
-});
-
-// 是否显示设置面板
-const isShowSettings = computed(() => defaultSettings.showSettings);
+// 响应式布局
+const { isMobile } = useLayoutResponsive();
 </script>
 
 <style lang="scss" scoped>
-.layout-wrapper {
+.layout {
   width: 100%;
   height: 100%;
+
+  &__overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
 }
 </style>
diff --git a/src/layouts/layouts/BaseLayout.vue b/src/layouts/layouts/BaseLayout.vue
deleted file mode 100644
index ca96d927..00000000
--- a/src/layouts/layouts/BaseLayout.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div class="layout" :class="layoutClass">
-    <!-- 移动端遮罩层 -->
-    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
-
-    <!-- 布局内容插槽 -->
-    <slot></slot>
-
-    <!-- 返回顶部按钮 -->
-    <el-backtop target=".app-main">
-      <div class="i-svg:backtop w-6 h-6" />
-    </el-backtop>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useLayout, useLayoutResponsive } from "@/composables";
-
-// 布局相关
-const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
-
-// 响应式布局
-const { isMobile } = useLayoutResponsive();
-</script>
-
-<style lang="scss" scoped>
-.layout {
-  width: 100%;
-  height: 100%;
-
-  &__overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.3);
-  }
-}
-</style>
diff --git a/src/layouts/modes/index.vue b/src/layouts/modes/index.vue
new file mode 100644
index 00000000..08d1f41f
--- /dev/null
+++ b/src/layouts/modes/index.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="layout-wrapper">
+    <component :is="currentLayoutComponent" />
+
+    <!-- 设置面板 - 独立于布局组件 -->
+    <Settings v-if="isShowSettings" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useRoute } from "vue-router";
+import { useLayout } from "@/composables/layout/useLayout";
+import LeftLayout from "@/layouts/modes/left/index.vue";
+import TopLayout from "@/layouts/modes/top/index.vue";
+import MixLayout from "@/layouts/modes/mix/index.vue";
+import Settings from "../components/Settings/index.vue";
+import { LayoutMode } from "@/enums/settings/layout.enum";
+import { defaultSettings } from "@/settings";
+
+const { currentLayout } = useLayout();
+const route = useRoute();
+
+// 根据当前布局模式选择对应的组件
+const currentLayoutComponent = computed(() => {
+  const override = route.meta?.layout as LayoutMode | undefined;
+  const layoutToUse = override ?? currentLayout.value;
+  switch (layoutToUse) {
+    case LayoutMode.TOP:
+      return TopLayout;
+    case LayoutMode.MIX:
+      return MixLayout;
+    case LayoutMode.LEFT:
+    default:
+      return LeftLayout;
+  }
+});
+
+// 是否显示设置面板
+const isShowSettings = computed(() => defaultSettings.showSettings);
+</script>
+
+<style lang="scss" scoped>
+.layout-wrapper {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/layouts/layouts/LeftLayout.vue b/src/layouts/modes/left/index.vue
similarity index 88%
rename from src/layouts/layouts/LeftLayout.vue
rename to src/layouts/modes/left/index.vue
index 9fa94cee..af012c91 100644
--- a/src/layouts/layouts/LeftLayout.vue
+++ b/src/layouts/modes/left/index.vue
@@ -30,12 +30,12 @@
 <script setup lang="ts">
 import { useLayout } from "@/composables/layout/useLayout";
 import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
-import BaseLayout from "./BaseLayout.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";
-import BasicMenu from "../components/Menu/BasicMenu.vue";
+import BaseLayout from "@/layouts/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";
+import BasicMenu from "../../components/Menu/BasicMenu.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen } = useLayout();
diff --git a/src/layouts/layouts/MixLayout.vue b/src/layouts/modes/mix/index.vue
similarity index 88%
rename from src/layouts/layouts/MixLayout.vue
rename to src/layouts/modes/mix/index.vue
index 6ca8f664..ae7c85fe 100644
--- a/src/layouts/layouts/MixLayout.vue
+++ b/src/layouts/modes/mix/index.vue
@@ -58,16 +58,17 @@
 </template>
 
 <script setup lang="ts">
+import { computed, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useWindowSize } from "@vueuse/core";
 import { useLayout, useLayoutMenu } from "@/composables";
-import BaseLayout from "./BaseLayout.vue";
-import AppLogo from "../components/AppLogo/index.vue";
-import MixTopMenu from "../components/Menu/MixTopMenu.vue";
-import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
-import TagsView from "../components/TagsView/index.vue";
-import AppMain from "../components/AppMain/index.vue";
-import MenuItem from "../components/Menu/components/MenuItem.vue";
+import BaseLayout from "@/layouts/index.vue";
+import AppLogo from "../../components/AppLogo/index.vue";
+import MixTopMenu from "../../components/Menu/MixTopMenu.vue";
+import NavbarActions from "../../components/NavBar/components/NavbarActions.vue";
+import TagsView from "../../components/TagsView/index.vue";
+import AppMain from "../../components/AppMain/index.vue";
+import MenuItem from "../../components/Menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 import { isExternal } from "@/utils/index";
@@ -91,8 +92,8 @@ const isLogoCollapsed = computed(() => width.value < 768);
 const activeLeftMenuPath = computed(() => {
   const { meta, path } = route;
   // 如果设置了activeMenu，则使用
-  if (meta?.activeMenu && typeof meta.activeMenu === "string") {
-    return meta.activeMenu;
+  if ((meta?.activeMenu as unknown as string) && typeof meta.activeMenu === "string") {
+    return meta.activeMenu as unknown as string;
   }
   return path;
 });
@@ -116,26 +117,16 @@ function resolvePath(routePath: string) {
 watch(
   () => route.path,
   (newPath) => {
-    console.log("📍 Route changed in MixLayout:", newPath);
-
     // 获取顶级路径
     const topMenuPath =
       newPath.split("/").filter(Boolean).length > 1 ? newPath.match(/^\/[^/]+/)?.[0] || "/" : "/";
 
     // 如果当前路径属于当前激活的顶部菜单
     if (newPath.startsWith(activeTopMenuPath.value)) {
-      console.log("📍 Route is under active top menu, ensuring menu item is activated");
+      // no-op
     }
     // 如果路径改变了顶级菜单，确保顶部菜单和左侧菜单都更新
     else if (topMenuPath !== activeTopMenuPath.value) {
-      console.log(
-        "📍 Top menu changed, updating active menu from:",
-        activeTopMenuPath.value,
-        "to:",
-        topMenuPath
-      );
-
-      // 主动更新顶部菜单和左侧菜单
       const appStore = useAppStore();
       const permissionStore = usePermissionStore();
 
@@ -283,7 +274,6 @@ watch(
     }
   }
 }
-
 :deep(.hasTagsView) {
   .app-main {
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
diff --git a/src/layouts/layouts/TopLayout.vue b/src/layouts/modes/top/index.vue
similarity index 88%
rename from src/layouts/layouts/TopLayout.vue
rename to src/layouts/modes/top/index.vue
index 485c41fc..f82e3504 100644
--- a/src/layouts/layouts/TopLayout.vue
+++ b/src/layouts/modes/top/index.vue
@@ -23,16 +23,14 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
-import { useWindowSize } from "@vueuse/core";
 import { useLayout } from "@/composables/layout/useLayout";
 import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
-import BaseLayout from "./BaseLayout.vue";
-import AppLogo from "../components/AppLogo/index.vue";
-import BasicMenu from "../components/Menu/BasicMenu.vue";
-import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
-import TagsView from "../components/TagsView/index.vue";
-import AppMain from "../components/AppMain/index.vue";
+import BaseLayout from "@/layouts/index.vue";
+import AppLogo from "../../components/AppLogo/index.vue";
+import BasicMenu from "../../components/Menu/BasicMenu.vue";
+import NavbarActions from "../../components/NavBar/components/NavbarActions.vue";
+import TagsView from "../../components/TagsView/index.vue";
+import AppMain from "../../components/AppMain/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo } = useLayout();
diff --git a/src/router/index.ts b/src/router/index.ts
index 2f156190..1b20750e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,7 @@
 import type { App } from "vue";
 import { createRouter, createWebHashHistory, type RouteRecordRaw } from "vue-router";
 
-export const Layout = () => import("@/layouts/index.vue");
+export const Layout = () => import("@/layouts/modes/index.vue");
 
 // 静态路由
 export const constantRoutes: RouteRecordRaw[] = [
diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index a4088f7f..8f8b99b4 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -5,7 +5,7 @@ import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/system/menu-api";
 const modules = import.meta.glob("../../views/**/**.vue");
-const Layout = () => import("@/layouts/index.vue");
+const Layout = () => import("@/layouts/modes/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
   // 所有路由（静态路由 + 动态路由）