fix: router-view nest

arco-design · Apr 20, 2022 · 8c3d786 · 8c3d786
1 parent fcdc9c0
commit 8c3d786
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/arco-design-pro-vite/src/components/menu/index.vue b/arco-design-pro-vite/src/components/menu/index.vue
@@ -103,7 +103,7 @@
               // This is demo, modify nodes as needed
               const icon = element?.meta?.icon
                 ? () => h(compile(`<${element?.meta?.icon}/>`))
-                : undefined;
+                : null;
               const r = element?.children ? (
                 <a-sub-menu
                   key={element?.name}

diff --git a/arco-design-pro-vite/src/layout/page-layout.vue b/arco-design-pro-vite/src/layout/page-layout.vue
@@ -1,19 +1,10 @@
 <template>
-  <router-view>
-    <template #default="{ Component: ParentComponent }">
-      <router-view v-slot="{ Component = ParentComponent, route }">
-        <transition name="fade" mode="out-in" appear>
-          <component
-            :is="Component"
-            v-if="route.meta.ignoreCache"
-            :key="route.fullPath"
-          />
-          <keep-alive v-else :include="cacheList">
-            <component :is="Component" :key="route.fullPath" />
-          </keep-alive>
-        </transition>
-      </router-view>
-    </template>
+  <router-view v-slot="{ Component, route }">
+    <transition name="fade" mode="out-in" appear>
+      <keep-alive :include="cacheList">
+        <component :is="Component" :key="route.fullPath" />
+      </keep-alive>
+    </transition>
   </router-view>
 </template>
 

diff --git a/arco-design-pro-vite/src/store/modules/tab-bar/index.ts b/arco-design-pro-vite/src/store/modules/tab-bar/index.ts
@@ -19,7 +19,7 @@ const useAppStore = defineStore('tabBar', {
       // Set the first element dynamically as needed
       {
         title: 'menu.dashboard.workplace',
-        name: 'workplace',
+        name: 'Workplace',
         fullPath: '/dashboard/workplace',
       },
     ],
@@ -37,7 +37,9 @@ const useAppStore = defineStore('tabBar', {
   actions: {
     updateTabList(route: RouteLocationNormalized) {
       this.tagList.push(formatTag(route));
-      this.cacheTabList.add(route.name as string);
+      if (!route.meta.ignoreCache) {
+        this.cacheTabList.add(route.name as string);
+      }
     },
     deleteTag(idx: number, tag: TagProps) {
       this.tagList.splice(idx, 1);