wip: 临时提交
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
<div class="layout__header-content">
|
<div class="layout__header-content">
|
||||||
<!-- Logo区域 -->
|
<!-- Logo区域 -->
|
||||||
<div v-if="isShowLogo" class="layout__header-logo">
|
<div v-if="isShowLogo" class="layout__header-logo">
|
||||||
<AppLogo :collapse="false" />
|
<AppLogo :collapse="isLogoCollapsed" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 顶部菜单区域 -->
|
<!-- 顶部菜单区域 -->
|
||||||
@@ -60,6 +60,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed } from "vue";
|
import { computed } from "vue";
|
||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
|
import { useWindowSize } from "@vueuse/core";
|
||||||
import { useLayout } from "../composables/useLayout";
|
import { useLayout } from "../composables/useLayout";
|
||||||
import { useLayoutMenu } from "../composables/useLayoutMenu";
|
import { useLayoutMenu } from "../composables/useLayoutMenu";
|
||||||
import BaseLayout from "./BaseLayout.vue";
|
import BaseLayout from "./BaseLayout.vue";
|
||||||
@@ -80,6 +81,12 @@ const { isShowTagsView, isShowLogo, isSidebarOpen, toggleSidebar } = useLayout()
|
|||||||
// 菜单相关
|
// 菜单相关
|
||||||
const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
|
const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
|
||||||
|
|
||||||
|
// 响应式窗口尺寸
|
||||||
|
const { width } = useWindowSize();
|
||||||
|
|
||||||
|
// 只有在小屏设备(移动设备)时才折叠Logo(只显示图标,隐藏文字)
|
||||||
|
const isLogoCollapsed = computed(() => width.value < 768);
|
||||||
|
|
||||||
// 当前激活的菜单
|
// 当前激活的菜单
|
||||||
const activeMenu = computed(() => {
|
const activeMenu = computed(() => {
|
||||||
const { meta, path } = route;
|
const { meta, path } = route;
|
||||||
@@ -120,6 +127,7 @@ console.log("🎨 MixLayout rendered");
|
|||||||
&-content {
|
&-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
min-width: 768px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
@@ -129,9 +137,19 @@ console.log("🎨 MixLayout rendered");
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: $sidebar-width;
|
width: $sidebar-width; // 默认宽度:显示logo+文字
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
|
// 中屏设备优化(800px-1100px):适度缩小但保持显示文字
|
||||||
|
@media (min-width: 768px) and (max-width: 1100px) {
|
||||||
|
width: 180px; // 缩小到180px,为菜单腾出空间
|
||||||
|
}
|
||||||
|
|
||||||
|
// 小屏设备:只显示logo,使用收缩宽度
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
width: $sidebar-width-collapsed; // 只显示logo:54px
|
||||||
|
}
|
||||||
|
|
||||||
:deep(.logo) {
|
:deep(.logo) {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
@@ -145,10 +163,19 @@ console.log("🎨 MixLayout rendered");
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
min-width: 0;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
margin: 0 16px;
|
margin: 0 16px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
|
@media (min-width: 768px) and (max-width: 1200px) {
|
||||||
|
margin: 0 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
margin: 0 8px;
|
||||||
|
}
|
||||||
|
|
||||||
:deep(.el-menu) {
|
:deep(.el-menu) {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
@@ -165,6 +192,16 @@ console.log("🎨 MixLayout rendered");
|
|||||||
line-height: $navbar-height;
|
line-height: $navbar-height;
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
|
|
||||||
|
@media (min-width: 768px) and (max-width: 1200px) {
|
||||||
|
padding: 0 12px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
padding: 0 8px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: rgba(255, 255, 255, 0.08);
|
background-color: rgba(255, 255, 255, 0.08);
|
||||||
}
|
}
|
||||||
@@ -183,6 +220,14 @@ console.log("🎨 MixLayout rendered");
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 0 16px;
|
padding: 0 16px;
|
||||||
|
|
||||||
|
@media (min-width: 768px) and (max-width: 1200px) {
|
||||||
|
padding: 0 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
padding: 0 8px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<div class="layout__header">
|
<div class="layout__header">
|
||||||
<div class="layout__header-left">
|
<div class="layout__header-left">
|
||||||
<!-- Logo -->
|
<!-- Logo -->
|
||||||
<AppLogo v-if="isShowLogo" :collapse="false" />
|
<AppLogo v-if="isShowLogo" :collapse="isLogoCollapsed" />
|
||||||
<!-- 菜单 -->
|
<!-- 菜单 -->
|
||||||
<BasicMenu :data="routes" menu-mode="horizontal" base-path="" />
|
<BasicMenu :data="routes" menu-mode="horizontal" base-path="" />
|
||||||
</div>
|
</div>
|
||||||
@@ -23,6 +23,8 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { computed } from "vue";
|
||||||
|
import { useWindowSize } from "@vueuse/core";
|
||||||
import { useLayout } from "../composables/useLayout";
|
import { useLayout } from "../composables/useLayout";
|
||||||
import { useLayoutMenu } from "../composables/useLayoutMenu";
|
import { useLayoutMenu } from "../composables/useLayoutMenu";
|
||||||
import BaseLayout from "./BaseLayout.vue";
|
import BaseLayout from "./BaseLayout.vue";
|
||||||
@@ -37,6 +39,12 @@ const { isShowTagsView, isShowLogo } = useLayout();
|
|||||||
|
|
||||||
// 菜单相关
|
// 菜单相关
|
||||||
const { routes } = useLayoutMenu();
|
const { routes } = useLayoutMenu();
|
||||||
|
|
||||||
|
// 响应式窗口尺寸
|
||||||
|
const { width } = useWindowSize();
|
||||||
|
|
||||||
|
// 只有在小屏设备(移动设备)时才折叠Logo(只显示图标,隐藏文字)
|
||||||
|
const isLogoCollapsed = computed(() => width.value < 768);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@@ -49,6 +57,7 @@ const { routes } = useLayoutMenu();
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
min-width: 768px; // 设置最小宽度,防止过度压缩
|
||||||
height: $navbar-height;
|
height: $navbar-height;
|
||||||
background-color: $menu-background;
|
background-color: $menu-background;
|
||||||
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
|
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
|
||||||
@@ -57,16 +66,31 @@ const { routes } = useLayoutMenu();
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
min-width: 0; // 允许flex收缩
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
overflow: hidden; // 防止溢出
|
||||||
|
|
||||||
// Logo 样式
|
// Logo 样式 - 使用SCSS变量管理宽度
|
||||||
:deep(.sidebar-logo) {
|
:deep(.sidebar-logo) {
|
||||||
width: $sidebar-width;
|
flex-shrink: 0; // 防止Logo被压缩
|
||||||
|
width: $sidebar-width; // 默认宽度:显示logo+文字
|
||||||
height: $navbar-height;
|
height: $navbar-height;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
|
|
||||||
|
// 中屏设备优化(800px-1100px):适度缩小但保持显示文字
|
||||||
|
@media (min-width: 768px) and (max-width: 1100px) {
|
||||||
|
width: 180px; // 缩小到180px,为菜单腾出空间
|
||||||
|
margin-right: 16px; // 减少右边距
|
||||||
|
}
|
||||||
|
|
||||||
|
// 小屏设备:只显示logo,使用收缩宽度
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
width: $sidebar-width-collapsed; // 只显示logo:54px
|
||||||
|
margin-right: 12px; // 减少右边距
|
||||||
|
}
|
||||||
|
|
||||||
.sidebar-logo__link {
|
.sidebar-logo__link {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
@@ -80,14 +104,18 @@ const { routes } = useLayoutMenu();
|
|||||||
|
|
||||||
&-right {
|
&-right {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex-shrink: 0; // 防止操作按钮被压缩
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
padding-left: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 限制菜单高度
|
// 限制菜单高度
|
||||||
:deep(.el-menu--horizontal) {
|
:deep(.el-menu--horizontal) {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
min-width: 0; // 允许菜单收缩
|
||||||
height: $navbar-height;
|
height: $navbar-height;
|
||||||
|
overflow: hidden; // 防止菜单溢出
|
||||||
line-height: $navbar-height;
|
line-height: $navbar-height;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
@@ -95,12 +123,33 @@ const { routes } = useLayoutMenu();
|
|||||||
.el-menu-item {
|
.el-menu-item {
|
||||||
height: $navbar-height;
|
height: $navbar-height;
|
||||||
line-height: $navbar-height;
|
line-height: $navbar-height;
|
||||||
|
|
||||||
|
// 响应式菜单项
|
||||||
|
@media (min-width: 768px) and (max-width: 1200px) {
|
||||||
|
padding: 0 12px; // 中屏设备减少内边距
|
||||||
|
font-size: 14px; // 稍微缩小字体
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
padding: 0 8px; // 小屏设备进一步减少内边距
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-sub-menu {
|
.el-sub-menu {
|
||||||
.el-sub-menu__title {
|
.el-sub-menu__title {
|
||||||
height: $navbar-height;
|
height: $navbar-height;
|
||||||
line-height: $navbar-height;
|
line-height: $navbar-height;
|
||||||
|
|
||||||
|
@media (min-width: 768px) and (max-width: 1200px) {
|
||||||
|
padding: 0 12px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
padding: 0 8px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,9 +166,29 @@ const { routes } = useLayoutMenu();
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 当存在TagsView时的样式调整
|
||||||
.hasTagsView {
|
.hasTagsView {
|
||||||
:deep(.app-main) {
|
:deep(.app-main) {
|
||||||
height: calc(100vh - $navbar-height - $tags-view-height) !important;
|
height: calc(100vh - $navbar-height - $tags-view-height) !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 中屏设备的特殊优化
|
||||||
|
@media (min-width: 768px) and (max-width: 1200px) {
|
||||||
|
.layout {
|
||||||
|
&__header {
|
||||||
|
padding: 0 8px; // 添加少量内边距
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 小屏设备的特殊优化
|
||||||
|
@media (max-width: 767px) {
|
||||||
|
.layout {
|
||||||
|
&__header {
|
||||||
|
min-width: 600px; // 小屏设备的最小宽度
|
||||||
|
padding: 0 4px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user