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

2025-05-28 17:13:50 +08:00
parent 9db6ade1ed f31360ba4e
commit 1f68fd31b7
7 changed files with 96 additions and 8 deletions
--- a/packages/effects/access/src/accessible.ts
+++ b/packages/effects/access/src/accessible.ts
@@ -104,6 +104,15 @@ async function generateRoutes(
      );
      break;
    }
+    case 'mixed': {
+      const [frontend_resultRoutes, backend_resultRoutes] = await Promise.all([
+        generateRoutesByFrontend(routes, roles || [], forbiddenComponent),
+        generateRoutesByBackend(options),
+      ]);
+
+      resultRoutes = [...frontend_resultRoutes, ...backend_resultRoutes];
+      break;
+    }
  }

  /**