fix: 🐛 布局切换问题修复

This commit is contained in:
hxr
2024-02-18 23:23:28 +08:00
parent 4c0baa8bb7
commit 53250a28dd
5 changed files with 45 additions and 17 deletions

View File

@@ -48,13 +48,10 @@
<script setup lang="ts">
import { useAppStore, useSettingsStore, usePermissionStore } from "@/store";
const permissionStore = usePermissionStore();
const { width } = useWindowSize();
const WIDTH = 992; // 响应式布局容器固定宽度 大屏(>=1200px 中屏(>=992px 小屏(>=768px
const appStore = useAppStore();
const settingsStore = useSettingsStore();
const permissionStore = usePermissionStore();
const fixedHeader = computed(() => settingsStore.fixedHeader);
const showTagsView = computed(() => settingsStore.tagsView);
@@ -90,6 +87,9 @@ const classObj = computed(() => ({
"layout-mix": layout.value === "mix",
}));
const width = useWindowSize().width;
const WIDTH = 992; // 响应式布局容器固定宽度 大屏(>=1200px 中屏(>=992px 小屏(>=768px
watchEffect(() => {
if (width.value < WIDTH) {
appStore.toggleDevice("mobile");
@@ -166,13 +166,19 @@ function toggleSidebar() {
}
:deep(.el-menu-item),
:deep(.el-sub-menu__title) {
:deep(.el-sub-menu__title),
:deep(.el-menu--horizontal) {
height: $navbar-height;
line-height: $navbar-height;
}
:deep(.el-menu--collapse) {
width: 100%;
}
}
.main-container {
margin-top: $navbar-height;
margin-left: 0;
}
}
@@ -199,9 +205,10 @@ function toggleSidebar() {
}
}
.fixed-header {
top: $navbar-height;
width: calc(100% - $sidebar-width);
&.hideSidebar {
.sidebar-container {
width: 100% !important;
}
}
.mix-container {
@@ -244,6 +251,10 @@ function toggleSidebar() {
flex: 1;
min-width: 0;
margin-left: 0;
.fixed-header {
top: $navbar-height;
}
}
}
}
@@ -262,6 +273,7 @@ function toggleSidebar() {
}
.fixed-header {
left: $sidebar-width-collapsed;
width: calc(100% - $sidebar-width-collapsed);
}