From 7d8b8db256f78b228b2b4629a472834a4cce9bd4 Mon Sep 17 00:00:00 2001 From: Vben Date: Mon, 8 Mar 2021 21:33:53 +0800 Subject: [PATCH] fix(transition): fix transition not work close #334 --- CHANGELOG.zh_CN.md | 1 + src/layouts/page/transition.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index d99c64b5..57bd0cfd 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -7,6 +7,7 @@ ### 🐛 Bug Fixes - 确保 `table action` 的值被正确更新 +- 修复页面切换的动画无法关闭 ## 2.0.3 (2021-03-07) diff --git a/src/layouts/page/transition.ts b/src/layouts/page/transition.ts index 3adee3b5..1d22c9ae 100644 --- a/src/layouts/page/transition.ts +++ b/src/layouts/page/transition.ts @@ -18,12 +18,16 @@ export function getTransitionName({ def: string; cacheTabs: string[]; }) { + if (!enableTransition) { + return null; + } + const isInCache = cacheTabs.includes(route.name as string); const transitionName = 'fade-slide'; let name: string | null = transitionName; if (openCache) { - name = isInCache && route.meta.loaded && enableTransition ? transitionName : null; + name = isInCache && route.meta.loaded ? transitionName : null; } return name || route.meta.transitionName || def; } -- GitLab