From 5055e40de69cc0e7a79e5a1b69c509de745f7484 Mon Sep 17 00:00:00 2001
From: peng <cavin@maimaiplanet.com>
Date: Mon, 27 Oct 2025 11:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=89=8D=E7=AB=AF=20-=20=E9=A1=B5=E9=9D=A2=E4=B8=BB?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=BB=9A=E5=8A=A8=E6=9D=A1fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crop-x/src/components/layouts/SideBar/SideBarOld.tsx   |  2 +-
 .../layouts/SideBar/components/MainContent.tsx         |  4 ++--
 crop-x/src/styles/body.css                             | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/crop-x/src/components/layouts/SideBar/SideBarOld.tsx b/crop-x/src/components/layouts/SideBar/SideBarOld.tsx
index c2deb5b..b34fdfb 100644
--- a/crop-x/src/components/layouts/SideBar/SideBarOld.tsx
+++ b/crop-x/src/components/layouts/SideBar/SideBarOld.tsx
@@ -222,7 +222,7 @@ export function SideBarOld({
   return (
     <div className={cn(
       "flex h-full bg-background",
-      "min-h-screen"
+      "min-h-0"  // 确保父容器有正确的高度约束
     )}>
       {/* 左侧导航栏 - 独立滚动 */}
       {!isMobile && (
diff --git a/crop-x/src/components/layouts/SideBar/components/MainContent.tsx b/crop-x/src/components/layouts/SideBar/components/MainContent.tsx
index 38ef028..ed8f090 100644
--- a/crop-x/src/components/layouts/SideBar/components/MainContent.tsx
+++ b/crop-x/src/components/layouts/SideBar/components/MainContent.tsx
@@ -62,8 +62,8 @@ export function MainContent({
   }
 
   return (
-    <div className="flex-1 flex flex-col bg-background">
-      <div className="p-6">
+    <div className="flex-1 flex flex-col bg-background h-full">
+      <div className="flex-1 p-6 min-h-0 content-container">
         {children}
       </div>
     </div>
diff --git a/crop-x/src/styles/body.css b/crop-x/src/styles/body.css
index beee569..4cc8ec7 100644
--- a/crop-x/src/styles/body.css
+++ b/crop-x/src/styles/body.css
@@ -23,9 +23,19 @@
 
 .contentScroll{
     height: 100%;
+    min-height: 0;
     overflow-y: auto;
 }
 
+/* 内容容器底部间距 */
+.content-container::after {
+    content: '';
+    display: block;
+    height: 2rem; /* 5rem 底部间距 */
+    width: 100%;
+    flex-shrink: 0;
+}
+
 /* 滚动条颜色变量 */
 :root {
   --scrollbar-color: #d1d5db;