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

packages/effects/access/src/accessible.ts

@@ -5,7 +5,7 @@ import type {
 } from '@vben/types';
 
 import {
-  cloneDepp,
+  cloneDeep,
   generateMenus,
   generateRoutesByBackend,
   generateRoutesByFrontend,
@@ -18,7 +18,7 @@ async function generateAccessible(
 ) {
   const { router } = options;
 
-  options.routes = cloneDepp(options.routes);
+  options.routes = cloneDeep(options.routes);
   // 生成路由
   const accessibleRoutes = await generateRoutes(mode, options);
 

packages/effects/hooks/src/use-design-tokens.ts

@@ -56,7 +56,9 @@ export function useAntdDesignTokens() {
 
       tokens.colorBgBase = getCssVariableValue('--background');
 
-      tokens.borderRadius = getCssVariableValue('--radius', false);
+      const radius = Number.parseFloat(getCssVariableValue('--radius', false));
+      // 1rem = 16px
+      tokens.borderRadius = radius * 16;
 
       tokens.colorBgLayout = getCssVariableValue('--background-deep');
       tokens.colorBgMask = getCssVariableValue('--overlay');

packages/effects/layouts/src/basic/tabbar/use-tabbar.ts

@@ -1,9 +1,6 @@
 import type { TabDefinition } from '@vben/types';
 import type { IContextMenuItem } from '@vben-core/tabs-ui';
-import type {
-  RouteLocationNormalized,
-  RouteLocationNormalizedGeneric,
-} from 'vue-router';
+import type { RouteLocationNormalizedGeneric } from 'vue-router';
 
 import { computed, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -103,7 +100,14 @@ export function useTabbar() {
   watch(
     () => route.path,
     () => {
-      tabbarStore.addTab(route as RouteLocationNormalized);
+      // 这里不能用route，用route时，vue-router会自动将父级meta进行合并
+      const routes = router.getRoutes();
+      const currentRoute = routes.find((item) => item.path === route.path);
+      if (currentRoute) {
+        tabbarStore.addTab(
+          currentRoute as unknown as RouteLocationNormalizedGeneric,
+        );
+      }
     },
     { immediate: true },
   );