mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-08-27 14:49:43 +08:00
fix: Page switching display is abnormal
This commit is contained in:
@@ -12,7 +12,7 @@ defineOptions({ name: 'LayoutContent' });
|
||||
|
||||
const { keepAlive } = usePreferences();
|
||||
const tabsStore = useTabsStore();
|
||||
const { onTransitionEnd, spinning } = useContentSpinner();
|
||||
const { spinning } = useContentSpinner();
|
||||
|
||||
const { getCacheTabs, getExcludeTabs, renderRouteView } =
|
||||
storeToRefs(tabsStore);
|
||||
@@ -51,12 +51,7 @@ function getTransitionName(route: RouteLocationNormalizedLoaded) {
|
||||
/>
|
||||
<IFrameRouterView />
|
||||
<RouterView v-slot="{ Component, route }">
|
||||
<Transition
|
||||
:name="getTransitionName(route)"
|
||||
appear
|
||||
mode="out-in"
|
||||
@transitionend="onTransitionEnd"
|
||||
>
|
||||
<Transition :name="getTransitionName(route)" appear mode="out-in">
|
||||
<KeepAlive
|
||||
v-if="keepAlive"
|
||||
:exclude="getExcludeTabs"
|
||||
|
@@ -5,7 +5,6 @@ import { preferences } from '@vben-core/preferences';
|
||||
|
||||
function useContentSpinner() {
|
||||
const spinning = ref(false);
|
||||
const isStartTransition = ref(false);
|
||||
const startTime = ref(0);
|
||||
const router = useRouter();
|
||||
const minShowTime = 500;
|
||||
@@ -29,7 +28,6 @@ function useContentSpinner() {
|
||||
if (to.meta.loaded || !enableLoading.value) {
|
||||
return true;
|
||||
}
|
||||
isStartTransition.value = false;
|
||||
startTime.value = performance.now();
|
||||
spinning.value = true;
|
||||
return true;
|
||||
@@ -40,17 +38,13 @@ function useContentSpinner() {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 未进入过渡动画
|
||||
if (!isStartTransition.value) {
|
||||
// 关闭加载动画
|
||||
onEnd();
|
||||
}
|
||||
// 关闭加载动画
|
||||
onEnd();
|
||||
|
||||
isStartTransition.value = false;
|
||||
return true;
|
||||
});
|
||||
|
||||
return { onTransitionEnd: onEnd, spinning };
|
||||
return { spinning };
|
||||
}
|
||||
|
||||
export { useContentSpinner };
|
||||
|
Reference in New Issue
Block a user