Skip to content

Commit bedbd3c

Browse files
author
pixel
committed
修复了子路由模式下两个keepalive相互切换 keepalive失效的问题
1 parent 296110f commit bedbd3c

File tree

5 files changed

+30
-21
lines changed

5 files changed

+30
-21
lines changed

web/src/view/example/index.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<template>
2-
<router-view></router-view>
2+
<div>
3+
<keep-alive>
4+
<router-view v-if="$route.meta.keepAlive"></router-view>
5+
</keep-alive>
6+
<router-view v-if="!$route.meta.keepAlive"></router-view>
7+
</div>
38
</template>
49

510
<script>
611
export default {
7-
name:"Example",
8-
}
12+
name: "Example",
13+
};
914
</script>
10-
<style lang="scss">
11-
12-
</style>
15+
<style lang="scss"></style>

web/src/view/layout/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767
</transition>
6868
<transition mode="out-in" name="el-fade-in-linear">
6969
<keep-alive>
70-
<router-view :key="$route.fullPath" v-loading="loadingFlag" element-loading-text="正在加载中" class="admin-box" v-if="$route.meta.keepAlive && reloadFlag"></router-view>
70+
<router-view v-loading="loadingFlag" element-loading-text="正在加载中" class="admin-box" v-if="$route.meta.keepAlive && reloadFlag"></router-view>
7171
</keep-alive>
7272
</transition>
7373
<transition mode="out-in" name="el-fade-in-linear">
74-
<router-view :key="$route.fullPath" v-loading="loadingFlag" element-loading-text="正在加载中" class="admin-box" v-if="!$route.meta.keepAlive && reloadFlag"></router-view>
74+
<router-view v-loading="loadingFlag" element-loading-text="正在加载中" class="admin-box" v-if="!$route.meta.keepAlive && reloadFlag"></router-view>
7575
</transition>
7676
<BottomInfo />
7777
</el-main>

web/src/view/superAdmin/index.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<template>
2-
<router-view></router-view>
2+
<div>
3+
<keep-alive>
4+
<router-view v-if="$route.meta.keepAlive"></router-view>
5+
</keep-alive>
6+
<router-view v-if="!$route.meta.keepAlive"></router-view>
7+
</div>
38
</template>
49

510
<script>
611
export default {
7-
name:"SuperAdmin",
8-
}
12+
name: "SuperAdmin",
13+
};
914
</script>
10-
<style lang="scss">
11-
12-
</style>
15+
<style lang="scss"></style>

web/src/view/systemTools/autoCode/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ export default {
357357
const fdTypes = ["string", "int", "bool", "float64", "time.Time"];
358358
fdTypes.map(async fdtype => {
359359
const res = await getDict(fdtype);
360-
res.map(item => {
360+
res&&res.map(item => {
361361
this.fdMap[item.label] = fdtype;
362362
});
363363
});

web/src/view/workflow/index.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<template>
2-
<router-view></router-view>
2+
<div>
3+
<keep-alive>
4+
<router-view v-if="$route.meta.keepAlive"></router-view>
5+
</keep-alive>
6+
<router-view v-if="!$route.meta.keepAlive"></router-view>
7+
</div>
38
</template>
49

510
<script>
611
export default {
7-
name:"Workflow",
8-
}
12+
name: "Workflow",
13+
};
914
</script>
10-
<style lang="scss">
11-
12-
</style>
15+
<style lang="scss"></style>

0 commit comments

Comments
 (0)