This commit is contained in:
张成
2025-11-06 15:42:49 +08:00
parent 02c2d1a31c
commit 5ae32a550d
2 changed files with 20 additions and 4 deletions

View File

@@ -25,11 +25,27 @@
overflow: hidden; overflow: hidden;
color: darkgray; color: darkgray;
display: flex; display: flex;
flex: 1;
flex-direction: column;
} }
.main-layout-con { .main-layout-con {
display: flex; display: flex;
display: -webkit-flex; flex-direction: column;
height: 100%;
overflow: hidden;
}
.header-con-main {
height: 64px;
flex-shrink: 0;
}
.main-layout-content {
height: calc(100% - 64px);
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden; overflow: hidden;
} }

View File

@@ -1,6 +1,6 @@
<template> <template>
<Layout style="height: 100%" class="main"> <Layout style="height: 100%; display: flex; flex-direction: row;" class="main">
<Sider hide-trigger collapsible :width="256" :collapsed-width="64" v-model="collapsed" class="left-sider" :style="{overflow: 'hidden'}"> <Sider hide-trigger collapsible :width="256" :collapsed-width="64" v-model="collapsed" class="left-sider" :style="{overflow: 'hidden'}">
<div class="sidebar-brand" @click="goHome" v-if="!collapsed"> <div class="sidebar-brand" @click="goHome" v-if="!collapsed">
@@ -14,13 +14,13 @@
<Content class="main-content-con"> <Content class="main-content-con">
<Layout class="main-layout-con"> <Layout class="main-layout-con">
<Header> <Header class="header-con-main">
<headerBar class="header-con" @on-coll-change="collpasedChange" :collapsed="collapsed"> <headerBar class="header-con" @on-coll-change="collpasedChange" :collapsed="collapsed">
<Terminal></Terminal> <Terminal></Terminal>
<user :userName="userName" :user-avator="userAvator || ''" /> <user :userName="userName" :user-avator="userAvator || ''" />
</headerBar> </headerBar>
</Header> </Header>
<Layout> <Layout class="main-layout-content">
<Content class="content-wrapper"> <Content class="content-wrapper">
<router-view /> <router-view />