Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-11-24 11:47:31 +08:00
parent cc7e8eda4f b6edc5f574
commit e44f9a0aca
185 changed files with 2651 additions and 939 deletions
--- a/packages/utils/src/helpers/generate-menus.ts
+++ b/packages/utils/src/helpers/generate-menus.ts
@@ -83,7 +83,7 @@ function generateMenus(
  });

  // 对菜单进行排序，避免order=0时被替换成999的问题
-  menus = menus.sort((a, b) => (a?.order ?? 999) - (b?.order ?? 999));
+  menus = menus.toSorted((a, b) => (a?.order ?? 999) - (b?.order ?? 999));

  // 过滤掉隐藏的菜单项
  return filterTree(menus, (menu) => !!menu.show);