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

2025-05-08 09:28:52 +08:00
parent 540f24ed43 84ef207d9c
commit 12d0ba24e5
44 changed files with 173 additions and 59 deletions
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/utils",
-  "version": "5.5.5",
+  "version": "5.5.6",
  "homepage": "https://github.com/vbenjs/vue-vben-admin",
  "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
  "repository": {
--- a/packages/utils/src/helpers/generate-menus.ts
+++ b/packages/utils/src/helpers/generate-menus.ts
@@ -51,7 +51,7 @@ function generateMenus(
    // 处理子菜单
    const resultChildren = hideChildrenInMenu
      ? []
-      : (children as MenuRecordRaw[]);
+      : ((children as MenuRecordRaw[]) ?? []);

    // 设置子菜单的父子关系
    if (resultChildren.length > 0) {