From 6d8de5dbdb7aa0cc2c0357580b44e6e484842699 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Sun, 25 May 2025 06:22:00 +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 --- .../components/NavBar/components/NavbarActions.vue | 10 ---------- .../{menu => NavMenu}/components/MenuItem.vue | 0 .../{menu => NavMenu}/components/MenuItemTitle.vue | 0 .../{menu => NavMenu}/components/MixTopMenu.vue | 0 src/layouts/components/{menu => NavMenu}/index.vue | 0 src/layouts/views/LeftLayout.vue | 4 ++-- src/layouts/views/MixLayout.vue | 6 +++--- src/layouts/views/TopLayout.vue | 4 ++-- 8 files changed, 7 insertions(+), 17 deletions(-) rename src/layouts/components/{menu => NavMenu}/components/MenuItem.vue (100%) rename src/layouts/components/{menu => NavMenu}/components/MenuItemTitle.vue (100%) rename src/layouts/components/{menu => NavMenu}/components/MixTopMenu.vue (100%) rename src/layouts/components/{menu => NavMenu}/index.vue (100%) diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue index 083c2a82..87ca259f 100644 --- a/src/layouts/components/NavBar/components/NavbarActions.vue +++ b/src/layouts/components/NavBar/components/NavbarActions.vue @@ -107,16 +107,6 @@ const navbarActionsClass = computed(() => { return "navbar-actions--dark-text"; } } - - // 左侧布局下，如果侧边栏是经典蓝色，顶部导航栏使用白色文字 - if (layout === "left" && sidebarColorScheme === SidebarColor.CLASSIC_BLUE) { - return "navbar-actions--white-text"; - } - - // 左侧布局下的其他情况（包括极简白），使用默认深色文字 - if (layout === "left") { - return "navbar-actions--dark-text"; - } } return "navbar-actions--dark-text"; diff --git a/src/layouts/components/menu/components/MenuItem.vue b/src/layouts/components/NavMenu/components/MenuItem.vue similarity index 100% rename from src/layouts/components/menu/components/MenuItem.vue rename to src/layouts/components/NavMenu/components/MenuItem.vue diff --git a/src/layouts/components/menu/components/MenuItemTitle.vue b/src/layouts/components/NavMenu/components/MenuItemTitle.vue similarity index 100% rename from src/layouts/components/menu/components/MenuItemTitle.vue rename to src/layouts/components/NavMenu/components/MenuItemTitle.vue diff --git a/src/layouts/components/menu/components/MixTopMenu.vue b/src/layouts/components/NavMenu/components/MixTopMenu.vue similarity index 100% rename from src/layouts/components/menu/components/MixTopMenu.vue rename to src/layouts/components/NavMenu/components/MixTopMenu.vue diff --git a/src/layouts/components/menu/index.vue b/src/layouts/components/NavMenu/index.vue similarity index 100% rename from src/layouts/components/menu/index.vue rename to src/layouts/components/NavMenu/index.vue diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue index 286e68eb..217cda53 100644 --- a/src/layouts/views/LeftLayout.vue +++ b/src/layouts/views/LeftLayout.vue @@ -29,10 +29,10 @@ import { useLayout } from "../composables/useLayout"; import { useLayoutMenu } from "../composables/useLayoutMenu"; import BaseLayout from "./BaseLayout.vue"; import Sidebar from "../components/Sidebar/index.vue"; -import NavBar from "../components/Navbar/index.vue"; +import NavBar from "../components/NavBar/index.vue"; import TagsView from "../components/TagsView/index.vue"; import AppMain from "../components/AppMain/index.vue"; -import Menu from "../components/Menu/index.vue"; +import Menu from "../components/NavMenu/index.vue"; // 布局相关参数 const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout(); diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue index 55747140..978439a2 100644 --- a/src/layouts/views/MixLayout.vue +++ b/src/layouts/views/MixLayout.vue @@ -64,11 +64,11 @@ import { useLayout } from "../composables/useLayout"; import { useLayoutMenu } from "../composables/useLayoutMenu"; import BaseLayout from "./BaseLayout.vue"; import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue"; -import MixTopMenu from "../components/Menu/components/MixTopMenu.vue"; -import NavbarActions from "../components/Navbar/components/NavbarActions.vue"; +import MixTopMenu from "../components/NavMenu/components/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 MenuItem from "../components/NavMenu/components/MenuItem.vue"; import Hamburger from "@/components/Hamburger/index.vue"; import variables from "@/styles/variables.module.scss"; diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue index 83a1097f..bb8cab78 100644 --- a/src/layouts/views/TopLayout.vue +++ b/src/layouts/views/TopLayout.vue @@ -27,8 +27,8 @@ import { useLayout } from "../composables/useLayout"; import { useLayoutMenu } from "../composables/useLayoutMenu"; import BaseLayout from "./BaseLayout.vue"; import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue"; -import Menu from "../components/Menu/index.vue"; -import NavbarActions from "../components/Navbar/components/NavbarActions.vue"; +import Menu from "../components/NavMenu/index.vue"; +import NavbarActions from "../components/NavBar/components/NavbarActions.vue"; import TagsView from "../components/TagsView/index.vue"; import AppMain from "../components/AppMain/index.vue";