From 727ec661896231e2c23237ad98ab1393ccadc5e3 Mon Sep 17 00:00:00 2001
From: peng <cavin@maimaiplanet.com>
Date: Mon, 20 Oct 2025 10:26:14 +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-=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E5=AF=BC=E8=88=AA=E6=A0=8Ffix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crop-x/src/components/layouts/SideBar/SideBar.tsx | 7 +------
 crop-x/src/components/ui/sidebar.tsx              | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/crop-x/src/components/layouts/SideBar/SideBar.tsx b/crop-x/src/components/layouts/SideBar/SideBar.tsx
index fbd049d..1d243b9 100644
--- a/crop-x/src/components/layouts/SideBar/SideBar.tsx
+++ b/crop-x/src/components/layouts/SideBar/SideBar.tsx
@@ -37,12 +37,7 @@ export default function Page() {
           </Breadcrumb>
         </header>
         <div className="flex flex-1 flex-col gap-4 p-4">
-          {Array.from({ length: 24 }).map((_, index) => (
-            <div
-              key={index}
-              className="aspect-video h-12 w-full rounded-lg bg-muted/50"
-            />
-          ))}
+          我的页面内容
         </div>
       </SidebarInset>
     </SidebarProvider>
diff --git a/crop-x/src/components/ui/sidebar.tsx b/crop-x/src/components/ui/sidebar.tsx
index ce48c45..7113452 100644
--- a/crop-x/src/components/ui/sidebar.tsx
+++ b/crop-x/src/components/ui/sidebar.tsx
@@ -154,7 +154,7 @@ function SidebarProvider({
 function Sidebar({
   side = "left",
   variant = "sidebar",
-  collapsible = "offcanvas",
+  collapsible = "none",
   className,
   children,
   ...props
@@ -229,7 +229,7 @@ function Sidebar({
       <div
         data-slot="sidebar-container"
         className={cn(
-          "relative inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
+          "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
           side === "left"
             ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
             : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",