From 5ae32a550d55772423f17c7416ad9e261dfbe11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Thu, 6 Nov 2025 15:42:49 +0800
Subject: [PATCH] 1

---
 src/components/main/main.less | 18 +++++++++++++++++-
 src/components/main/main.vue  |  6 +++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/main/main.less b/src/components/main/main.less
index ef792c3..d41d64e 100644
--- a/src/components/main/main.less
+++ b/src/components/main/main.less
@@ -25,11 +25,27 @@
     overflow: hidden;
     color: darkgray;
     display: flex;
+    flex: 1;
+    flex-direction: column;
   }
 
   .main-layout-con {
     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;
   }
 
diff --git a/src/components/main/main.vue b/src/components/main/main.vue
index c7fad6b..56eaffb 100644
--- a/src/components/main/main.vue
+++ b/src/components/main/main.vue
@@ -1,6 +1,6 @@
 <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'}">
       <div class="sidebar-brand" @click="goHome" v-if="!collapsed">
@@ -14,13 +14,13 @@
     <Content class="main-content-con">
       <Layout class="main-layout-con">
 
-        <Header>
+        <Header  class="header-con-main">
           <headerBar class="header-con" @on-coll-change="collpasedChange" :collapsed="collapsed">
             <Terminal></Terminal>
             <user :userName="userName" :user-avator="userAvator || ''" />
           </headerBar>
         </Header>
-        <Layout>
+        <Layout  class="main-layout-content">
           <Content class="content-wrapper">
 
             <router-view />