From 04d61ae3b9db816059bdb693ebd5a6b710f2edbc Mon Sep 17 00:00:00 2001
From: peng <cavin@maimaiplanet.com>
Date: Wed, 22 Oct 2025 15:20:33 +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=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/layouts/SideBar/SideBarOld.tsx | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/crop-x/src/components/layouts/SideBar/SideBarOld.tsx b/crop-x/src/components/layouts/SideBar/SideBarOld.tsx
index 7327f68..e50d93c 100644
--- a/crop-x/src/components/layouts/SideBar/SideBarOld.tsx
+++ b/crop-x/src/components/layouts/SideBar/SideBarOld.tsx
@@ -170,21 +170,6 @@ const defaultSideBarData: SideBarData = {
   ]
 };
 
-// 转换 SideBarData 为 MenuItem 格式的工具函数
-const convertSideBarDataToMenus = (sideBarData?: SideBarData): MenuItem[] => {
-  if (!sideBarData?.navMain) return [];
-
-  return sideBarData.navMain.map(item => ({
-    id: item.url.replace(/\/[^\/]+/g, '').replace('/', '') || item.title.replace(/\s+/g, '-').toLowerCase(),
-    label: item.title,
-    icon: <span className="text-lg">{item.icon}</span>,
-    children: item.items?.map(child => ({
-      id: child.url.split('/').pop() || child.title.replace(/\s+/g, '-').toLowerCase(),
-      label: child.title,
-      path: child.url,
-    })),
-  }));
-};
 
 export function SideBarOld({
   children,
@@ -199,7 +184,19 @@ export function SideBarOld({
   const [currentPath, setCurrentPath] = useState(pathname || activePath || '/machinery/list');
 
   // 使用传入的数据或默认数据
-  const menus = convertSideBarDataToMenus(data || defaultSideBarData);
+  const sidebarData = data || defaultSideBarData;
+
+  // 转换为 MenuItem 格式以兼容 LeftSidebar 组件
+  const menus = sidebarData.navMain.map(item => ({
+    id: item.url.replace(/\/[^\/]+/g, '').replace('/', '') || item.title.replace(/\s+/g, '-').toLowerCase(),
+    label: item.title,
+    icon: <span className="text-lg">{item.icon}</span>,
+    children: item.items?.map(child => ({
+      id: child.url.split('/').pop() || child.title.replace(/\s+/g, '-').toLowerCase(),
+      label: child.title,
+      path: child.url,
+    })),
+  }));
 
   // 检测是否为移动设备
   useEffect(() => {