Merge branch 'main' into example

src/layouts/modules/global-menu/modules/horizontal-mix-menu.vue

@@ -56,9 +56,7 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
       :theme-color="themeStore.themeColor"
       @select="handleSelectMixMenu"
       @toggle-sider-collapse="appStore.toggleSiderCollapse"
-    >
-      <slot></slot>
-    </FirstLevelMenu>
+    />
   </Teleport>
 </template>
 

src/layouts/modules/global-menu/modules/vertical-mix-menu.vue

@@ -49,8 +49,11 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
 }
 
 function handleResetActiveMenu() {
-  getActiveFirstLevelMenuKey();
   setDrawerVisible(false);
+
+  if (!appStore.mixSiderFixed) {
+    getActiveFirstLevelMenuKey();
+  }
 }
 
 const selectedKey = computed(() => {

src/router/elegant/transform.ts

@@ -97,10 +97,13 @@ function transformElegantRouteToVueRoute(
     if (component) {
       if (isSingleLevelRoute(route)) {
         const { layout, view } = getSingleLevelRouteComponent(component);
-  
+
         const singleLevelRoute: RouteRecordRaw = {
           path,
           component: layouts[layout],
+          meta: {
+            title: route.meta?.title || ''
+          },
           children: [
             {
               name,
@@ -110,36 +113,35 @@ function transformElegantRouteToVueRoute(
             } as RouteRecordRaw
           ]
         };
-  
+
         return [singleLevelRoute];
       }
-  
+
       if (isLayout(component)) {
         const layoutName = getLayoutName(component);
-  
+
         vueRoute.component = layouts[layoutName];
       }
-  
+
       if (isView(component)) {
         const viewName = getViewName(component);
-  
+
         vueRoute.component = views[viewName];
       }
-  
+
     }
   } catch (error: any) {
     console.error(`Error transforming route "${route.name}": ${error.toString()}`);
     return [];
   }
 
-  
   // add redirect to child
   if (children?.length && !vueRoute.redirect) {
     vueRoute.redirect = {
       name: children[0].name
     };
   }
-  
+
   if (children?.length) {
     const childRoutes = children.flatMap(child => transformElegantRouteToVueRoute(child, layouts, views));
 

src/typings/elegant-router.d.ts

@@ -88,7 +88,7 @@ declare module "@elegant-router/types" {
 
   /**
    * custom route key
-   */ 
+   */
   export type CustomRouteKey = Extract<
     RouteKey,
     | "root"
@@ -109,7 +109,7 @@ declare module "@elegant-router/types" {
 
   /**
    * the generated route key
-   */ 
+   */
   export type GeneratedRouteKey = Exclude<RouteKey, CustomRouteKey>;
 
   /**