From 5470429a79313630a7ddef601de1d89e7dada754 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 09:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev-new_pro_OA
---
src/layout/components/Sidebar/index.vue | 242 ++++++++++++++++++++++++++---------------------
1 files changed, 133 insertions(+), 109 deletions(-)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 0692dda..2a58c29 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,142 +1,166 @@
<template>
- <div :class="{ 'has-logo': showLogo }"
- class="sidebar-container">
- <logo v-if="showLogo"
- :collapse="isCollapse" />
+ <div :class="{ 'has-logo': showLogo }" class="sidebar-container">
+ <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar wrap-class="scrollbar-wrapper">
- <el-menu :default-active="activeMenu"
- :collapse="isCollapse"
- :background-color="getMenuBackground"
- :text-color="getMenuTextColor"
- :unique-opened="true"
- :active-text-color="theme"
- :collapse-transition="false"
- mode="vertical"
- :class="sideTheme">
- <sidebar-item v-for="(route, index) in sidebarRouters"
- :key="route.path + index"
- :item="route"
- :base-path="route.path" />
+ <el-menu
+ :default-active="activeMenu"
+ :collapse="isCollapse"
+ :background-color="getMenuBackground"
+ :text-color="getMenuTextColor"
+ :unique-opened="true"
+ :active-text-color="theme"
+ :collapse-transition="false"
+ mode="vertical"
+ :class="sideTheme"
+ >
+ <sidebar-item
+ v-for="(route, index) in sidebarRouters"
+ :key="route.path + index"
+ :item="route"
+ :base-path="route.path"
+ />
</el-menu>
</el-scrollbar>
</div>
</template>
<script setup>
- import Logo from "./Logo";
- import SidebarItem from "./SidebarItem";
- import variables from "@/assets/styles/variables.module.scss";
- import useAppStore from "@/store/modules/app";
- import useSettingsStore from "@/store/modules/settings";
- import usePermissionStore from "@/store/modules/permission";
+import Logo from "./Logo";
+import SidebarItem from "./SidebarItem";
+import useAppStore from "@/store/modules/app";
+import useSettingsStore from "@/store/modules/settings";
+import usePermissionStore from "@/store/modules/permission";
- const route = useRoute();
- const appStore = useAppStore();
- const settingsStore = useSettingsStore();
- const permissionStore = usePermissionStore();
+const route = useRoute();
+const appStore = useAppStore();
+const settingsStore = useSettingsStore();
+const permissionStore = usePermissionStore();
- const sidebarRouters = computed(() => permissionStore.sidebarRouters);
- const showLogo = computed(() => settingsStore.sidebarLogo);
- const sideTheme = computed(() => settingsStore.sideTheme);
- const theme = computed(() => settingsStore.theme);
- const isCollapse = computed(() => !appStore.sidebar.opened);
+const sidebarRouters = computed(() => permissionStore.sidebarRouters);
+const showLogo = computed(() => settingsStore.sidebarLogo);
+const sideTheme = computed(() => settingsStore.sideTheme);
+const theme = computed(() => settingsStore.theme);
+const isCollapse = computed(() => !appStore.sidebar.opened);
- const getMenuBackground = computed(() => "var(--sidebar-bg)");
+const getMenuBackground = computed(() => "var(--sidebar-bg)");
- const getMenuTextColor = computed(() => {
- if (settingsStore.isDark) {
- return "var(--sidebar-text)";
- }
- return sideTheme.value === "theme-dark"
- ? variables.menuText
- : variables.menuLightText;
- });
+const getMenuTextColor = computed(() => "var(--sidebar-text)");
- const activeMenu = computed(() => {
- const { meta, path } = route;
- if (meta.activeMenu) {
- return meta.activeMenu;
- }
- return path;
- });
+const activeMenu = computed(() => {
+ const { meta, path } = route;
+ if (meta.activeMenu) return meta.activeMenu;
+ return path;
+});
</script>
<style lang="scss" scoped>
- .sidebar-container {
- background-color: v-bind(getMenuBackground);
- border-radius: 22px;
- overflow: hidden;
+.sidebar-container {
+ background: transparent;
+ border-radius: 0;
+ overflow: hidden;
- .scrollbar-wrapper {
- background-color: v-bind(getMenuBackground);
+ .scrollbar-wrapper {
+ background: transparent;
+ }
+
+ .el-menu {
+ border: none !important;
+ height: 100%;
+ width: 100% !important;
+ border-radius: 0;
+ background: transparent !important;
+
+ .el-menu-item,
+ .el-sub-menu__title {
+ margin-bottom: 8px;
+ border-radius: 14px;
+ color: v-bind(getMenuTextColor);
+ font-size: 14px;
+ letter-spacing: 0;
+ transition:
+ transform 0.18s ease,
+ background 0.2s ease,
+ box-shadow 0.2s ease,
+ color 0.2s ease;
+ border: none !important;
+ display: flex;
+ align-items: center;
+
+ &:hover {
+ background: linear-gradient(128deg, rgba(var(--el-color-primary-rgb, 37, 99, 235), 0.28), rgba(var(--el-color-primary-rgb, 37, 99, 235), 0.08)) !important;
+ transform: translate3d(2px, 0, 0);
+ }
}
- .el-menu {
- border: none;
- height: 100%;
- width: 100% !important;
- border-radius: 22px;
+ .el-menu-item {
+ color: var(--sidebar-text);
- .el-menu-item,
- .el-sub-menu__title {
- margin-bottom: 6px;
+ &.is-active {
+ background: var(--menu-active-bg, linear-gradient(135deg, var(--el-color-primary), var(--el-color-primary-light-3))) !important;
+ color: var(--menu-active-text) !important;
+ font-weight: 500;
border-radius: 14px;
- color: v-bind(getMenuTextColor);
+ box-shadow: var(--menu-active-glow, 0 10px 24px rgba(var(--el-color-primary-rgb, 37, 99, 235), 0.34));
- &:hover {
- background-color: var(--menu-hover, rgba(0, 0, 0, 0.06)) !important;
- border-radius: 14px;
+ .svg-icon {
+ color: var(--menu-active-text) !important;
}
}
+ }
- .el-menu-item {
- &.is-active {
- color: v-bind(theme);
- background-color: var(--menu-active-bg, rgba(0, 0, 0, 0.06)) !important;
- font-weight: 600;
- }
- }
+ .el-sub-menu__title {
+ color: v-bind(getMenuTextColor);
+ }
- .el-sub-menu__title {
- color: v-bind(getMenuTextColor);
- }
+ :deep(.el-sub-menu__icon-arrow) {
+ display: inline-flex !important;
+ align-items: center;
+ justify-content: center;
+ width: 14px;
+ height: 14px;
+ margin-top: -7px;
+ right: 14px;
+ font-size: 14px !important;
+ color: currentColor !important;
+ opacity: 0.7;
+ transition: transform 0.2s ease, opacity 0.2s ease;
+ }
- :deep(.el-sub-menu.is-active > .el-sub-menu__title) {
- color: v-bind(theme) !important;
- font-weight: 600;
- background-color: var(--menu-active-bg, rgba(0, 0, 0, 0.06)) !important;
- border-radius: 14px;
- margin: 0 10px 6px !important;
- // width: calc(100% - 20px) !important;
- padding-left: 10px !important;
- padding-right: 10px !important;
- box-sizing: border-box;
- overflow: hidden;
- background-clip: padding-box;
- }
+ :deep(.el-sub-menu.is-opened .el-sub-menu__icon-arrow) {
+ transform: rotate(180deg);
+ }
- :deep(.el-menu-item.is-active) {
- margin: 0 10px 6px !important;
- width: calc(100% - 20px) !important;
- padding-left: 10px !important;
- padding-right: 10px !important;
- box-sizing: border-box;
- overflow: hidden;
- background-clip: padding-box;
- border-radius: 14px;
- }
+ :deep(.el-sub-menu.is-active > .el-sub-menu__title) {
+ color: var(--menu-active-text) !important;
+ font-weight: 500;
+ border-radius: 12px;
+ margin: 0 12px 6px !important;
+ padding-left: 14px !important;
+ padding-right: 34px !important;
+ box-sizing: border-box;
+ overflow: hidden;
+ background-clip: padding-box;
+ background: var(--menu-active-bg) !important;
+ box-shadow: var(--menu-active-glow);
+ border: none !important;
+ }
- :deep(.el-sub-menu.is-active > .el-sub-menu__title .menu-title),
- :deep(.el-sub-menu.is-active > .el-sub-menu__title .svg-icon),
- :deep(.el-menu-item.is-active .menu-title),
- :deep(.el-menu-item.is-active .svg-icon) {
- color: v-bind(theme) !important;
- }
+ :deep(.el-menu-item.is-active) {
+ margin: 0 12px 6px !important;
+ width: calc(100% - 24px) !important;
+ padding-left: 14px !important;
+ padding-right: 34px !important;
+ box-sizing: border-box;
+ overflow: hidden;
+ background-clip: padding-box;
+ border-radius: 12px;
+ }
- :deep(.el-sub-menu__title:hover),
- :deep(.el-menu-item:hover) {
- border-radius: 14px;
- }
+ :deep(.el-sub-menu.is-active > .el-sub-menu__title .menu-title),
+ :deep(.el-sub-menu.is-active > .el-sub-menu__title .svg-icon),
+ :deep(.el-menu-item.is-active .menu-title) {
+ color: var(--menu-active-text) !important;
}
}
+}
</style>
--
Gitblit v1.9.3