|
34 | 34 | <el-breadcrumb-item |
35 | 35 | v-for="item in matched.slice(1,matched.length)" |
36 | 36 | :key="item.path" |
37 | | - >{{ item.meta.title }}</el-breadcrumb-item> |
| 37 | + >{{ route.params.title || item.meta.title }}</el-breadcrumb-item> |
38 | 38 | </el-breadcrumb> |
39 | 39 | </el-col> |
40 | 40 | <el-col :xs="12" :lg="9" :md="9" :sm="14" :xl="9"> |
|
83 | 83 | </transition> |
84 | 84 | <router-view v-if="reloadFlag" v-slot="{ Component }" v-loading="loadingFlag" element-loading-text="正在加载中" class="admin-box"> |
85 | 85 | <transition mode="out-in" name="el-fade-in-linear"> |
86 | | - <keep-alive :include="useRouterStore.keepAliveRouters"> |
| 86 | + <keep-alive :include="routerStore.keepAliveRouters"> |
87 | 87 | <component :is="Component" /> |
88 | 88 | </keep-alive> |
89 | 89 | </transition> |
@@ -118,7 +118,8 @@ import { useRouterStore } from '@/pinia/modules/router' |
118 | 118 |
|
119 | 119 | const router = useRouter() |
120 | 120 | const route = useRoute() |
121 | | -
|
| 121 | +const routerStore = useRouterStore() |
| 122 | +console.log(routerStore.keepAliveRouters) |
122 | 123 | // 三种窗口适配 |
123 | 124 | const isCollapse = ref(false) |
124 | 125 | const isSider = ref(true) |
@@ -201,9 +202,14 @@ const changeUserAuth = async(id) => { |
201 | 202 |
|
202 | 203 | const reloadFlag = ref(true) |
203 | 204 | const reload = async() => { |
204 | | - reloadFlag.value = false |
205 | | - await nextTick() |
206 | | - reloadFlag.value = true |
| 205 | + if (route.meta.keepAlive) { |
| 206 | + reloadFlag.value = false |
| 207 | + await nextTick() |
| 208 | + reloadFlag.value = true |
| 209 | + } else { |
| 210 | + const title = route.meta.title |
| 211 | + router.push({ name: 'Reload', params: { title }}) |
| 212 | + } |
207 | 213 | } |
208 | 214 |
|
209 | 215 | const isShadowBg = ref(false) |
|
0 commit comments