GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(projects): fix disabled page animate

Browse Source
This commit is contained in:
Soybean 2024-04-16 01:15:45 +08:00
parent 42e16a0165
commit 23f283aa31
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/layouts/modules/global-content/index.vue
View File

@ -1,4 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from 'vue';
import { useAppStore } from '@/store/modules/app'; import { useAppStore } from '@/store/modules/app';
import { useThemeStore } from '@/store/modules/theme'; import { useThemeStore } from '@/store/modules/theme';
import { useRouteStore } from '@/store/modules/route'; import { useRouteStore } from '@/store/modules/route';
@ -19,12 +20,14 @@ withDefaults(defineProps<Props>(), {
const appStore = useAppStore(); const appStore = useAppStore();
const themeStore = useThemeStore(); const themeStore = useThemeStore();
const routeStore = useRouteStore(); const routeStore = useRouteStore();
const transitionName = computed(() => (themeStore.page.animate ? themeStore.page.animateMode : ''));
</script> </script>
<template> <template>
<RouterView v-slot="{ Component, route }"> <RouterView v-slot="{ Component, route }">
<Transition <Transition
:name="themeStore.page.animateMode" :name="transitionName"
mode="out-in" mode="out-in"
@before-leave="appStore.setContentXScrollable(true)" @before-leave="appStore.setContentXScrollable(true)"
@after-enter="appStore.setContentXScrollable(false)" @after-enter="appStore.setContentXScrollable(false)"

6
src/store/modules/app/index.ts
View File

@ -35,11 +35,11 @@ export const useAppStore = defineStore(SetupStoreId.App, () => {
async function reloadPage(duration = 300) { async function reloadPage(duration = 300) {
setReloadFlag(false); setReloadFlag(false);
if (duration > 0) { const d = themeStore.page.animate ? duration : 40;
await new Promise(resolve => { await new Promise(resolve => {
setTimeout(resolve, duration); setTimeout(resolve, d);
}); });
}
setReloadFlag(true); setReloadFlag(true);
} }