Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into cleaning

packages/utils/src/helpers/generate-menus.ts

@@ -8,7 +8,12 @@ import type {
   RouteRecordStringComponent,
 } from '@vben-core/typings';
 
-import { filterTree, isHttpUrl, mapTree } from '@vben-core/shared/utils';
+import {
+  filterTree,
+  isHttpUrl,
+  mapTree,
+  sortTree,
+} from '@vben-core/shared/utils';
 
 /**
  * 根据 routes 生成菜单列表
@@ -83,7 +88,7 @@ function generateMenus(
   });
 
   // 对菜单进行排序，避免order=0时被替换成999的问题
-  menus = menus.toSorted((a, b) => (a?.order ?? 999) - (b?.order ?? 999));
+  menus = sortTree(menus, (a, b) => (a?.order ?? 999) - (b?.order ?? 999));
 
   // 过滤掉隐藏的菜单项
   return filterTree(menus, (menu) => !!menu.show);
@@ -111,7 +116,7 @@ function convertServerMenuToRouteRecordStringComponent(
           hideInMenu: !menu.visible,
           icon: menu.icon,
           link: menu.path,
-          orderNo: menu.sort,
+          order: menu.sort,
           title: menu.name,
         },
         name: menu.name,
@@ -155,7 +160,7 @@ function convertServerMenuToRouteRecordStringComponent(
         hideInMenu: !menu.visible,
         icon: menu.icon,
         keepAlive: menu.keepAlive,
-        orderNo: menu.sort,
+        order: menu.sort,
         title: menu.name,
       },
       name: finalName,