Skip to content

Commit 8823d87

Browse files
committed
refactor: remove route animations
1 parent 222cb86 commit 8823d87

File tree

10 files changed

+24
-123
lines changed

10 files changed

+24
-123
lines changed

app/app.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<script setup lang="ts">
22
import type { ConfigProviderTheme } from 'vant'
33
import useKeepalive from '~/composables/keepalive'
4-
import useRouteTransitionName from '~/composables/transitions'
54
import { appName } from '~/constants'
65
76
useHead({
@@ -17,18 +16,14 @@ const mode = computed(() => {
1716
const keepAliveRouteNames = computed(() => {
1817
return useKeepalive().routeCaches as string[]
1918
})
20-
21-
const transitionName = computed(() => {
22-
return useRouteTransitionName().routeTransitionName
23-
})
2419
</script>
2520

2621
<template>
2722
<VanConfigProvider :theme="mode">
2823
<ColorScheme tag="div">
2924
<NuxtLoadingIndicator color="repeating-linear-gradient(to right,var(--c-primary) 0%,var(--c-primary-active) 100%)" />
3025
<NuxtLayout>
31-
<NuxtPage :keepalive="{ include: keepAliveRouteNames }" :transition="{ name: transitionName }" />
26+
<NuxtPage :keepalive="{ include: keepAliveRouteNames }" />
3227
</NuxtLayout>
3328
</ColorScheme>
3429
</VanConfigProvider>

app/components/Container.vue

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/composables/transitions.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

app/middleware/route.global.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
import type { RouteLocationNormalized } from '#vue-router'
21
import useKeepalive from '~/composables/keepalive'
3-
import routeTransitionNameStore from '~/composables/transitions'
42

5-
export default defineNuxtRouteMiddleware((to: RouteLocationNormalized, from) => {
6-
// KeepAlive
3+
export default defineNuxtRouteMiddleware((to) => {
74
if (to.meta && to.meta.keepalive)
85
useKeepalive().addRoute(to)
9-
10-
// Set route transition name
11-
if (!to.meta.level || !from.meta.level)
12-
return
13-
14-
if (to.meta.level > from.meta.level)
15-
routeTransitionNameStore().setName('slide-fadein-left')
16-
17-
else if (to.meta.level < from.meta.level)
18-
routeTransitionNameStore().setName('slide-fadein-right')
19-
20-
else
21-
routeTransitionNameStore().setName('')
226
})

app/pages/index.vue

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import type { PickerColumn } from 'vant'
44
import type { ComputedRef } from 'vue'
55
import { Locale } from 'vant'
66
7-
definePageMeta({
8-
level: 1,
9-
})
10-
117
const color = useColorMode()
128
139
useHead({
@@ -45,7 +41,7 @@ const menus = computed(() => [
4541
])
4642
4743
function onLanguageConfirm(event: { selectedOptions: PickerColumn }) {
48-
const lang = event.selectedOptions[0].code
44+
const lang = event.selectedOptions[0]?.code
4945
5046
setLocale(lang)
5147
Locale.use(lang)
@@ -56,7 +52,7 @@ function onLanguageConfirm(event: { selectedOptions: PickerColumn }) {
5652
</script>
5753

5854
<template>
59-
<Container :padding-x="0">
55+
<div>
6056
<VanCellGroup inset>
6157
<VanCell :title="$t('menu.darkMode')" center>
6258
<template #right-icon>
@@ -76,19 +72,19 @@ function onLanguageConfirm(event: { selectedOptions: PickerColumn }) {
7672
@click="showLanguagePicker = true"
7773
/>
7874

79-
<van-popup v-model:show="showLanguagePicker" position="bottom">
80-
<van-picker
81-
v-model="languageValues"
82-
:columns="locales"
83-
:columns-field-names="{ text: 'name', value: 'code' }"
84-
@confirm="onLanguageConfirm"
85-
@cancel="showLanguagePicker = false"
86-
/>
87-
</van-popup>
88-
8975
<template v-for="item in menus" :key="item.route">
9076
<VanCell :title="item.title" :to="item.route" is-link />
9177
</template>
9278
</VanCellGroup>
93-
</Container>
79+
80+
<van-popup v-model:show="showLanguagePicker" position="bottom">
81+
<van-picker
82+
v-model="languageValues"
83+
:columns="locales"
84+
:columns-field-names="{ text: 'name', value: 'code' }"
85+
@confirm="onLanguageConfirm"
86+
@cancel="showLanguagePicker = false"
87+
/>
88+
</van-popup>
89+
</div>
9490
</template>

app/pages/keepalive/index.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ definePageMeta({
88
keepalive: true,
99
title: '🧡 KeepAlive',
1010
i18n: 'menu.keepAlive',
11-
level: 2,
1211
})
1312
1413
const value = ref(1)
1514
</script>
1615

1716
<template>
18-
<Container>
19-
<p>{{ $t('keepalive_page.label') }}</p>
20-
<van-stepper v-model="value" />
21-
</Container>
17+
<div>
18+
<p> {{ $t('keepalive_page.label') }} </p>
19+
<van-stepper v-model="value" class="mt-10" />
20+
</div>
2221
</template>

app/pages/profile/index.vue

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
<script setup lang="ts">
2-
definePageMeta({
3-
level: 1,
4-
})
5-
</script>
6-
71
<template>
8-
<Container>
9-
<div mx-auto mb-60 pt-15 text-center text-16 text-dark dark:text-white>
10-
{{ $t('profile_page.txt') }}
11-
</div>
12-
</Container>
2+
<div mx-auto mb-60 pt-15 text-center text-16 text-dark dark:text-white>
3+
{{ $t('profile_page.txt') }}
4+
</div>
135
</template>

app/pages/unocss/index.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
definePageMeta({
33
title: '🎨 Unocss 示例',
44
i18n: 'menu.unocssExample',
5-
level: 2,
65
})
76
</script>
87

98
<template>
10-
<Container>
9+
<div>
1110
<h1 class="text-6xl color-pink font-semibold">
1211
{{ $t('unocss_page.hello', ['Unocss!']) }}
1312
</h1>
@@ -19,5 +18,5 @@ definePageMeta({
1918
<button class="mt-10 btn">
2019
{{ $t('unocss_page.btn_txt') }}
2120
</button>
22-
</Container>
21+
</div>
2322
</template>

app/styles/global.css

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#__nuxt {
2-
height: 100vh;
32
margin: 0;
43
padding: 0;
5-
position: relative;
64
}
75

86
html {
@@ -14,25 +12,3 @@ html.dark {
1412
background: #222;
1513
color-scheme: dark;
1614
}
17-
18-
.slide-fadein-left-enter-active,
19-
.slide-fadein-left-leave-active,
20-
.slide-fadein-right-enter-active,
21-
.slide-fadein-right-leave-active {
22-
transition:
23-
opacity 0.3s,
24-
transform 0.4s,
25-
-webkit-transform 0.4s;
26-
}
27-
28-
.slide-fadein-left-enter-from,
29-
.slide-fadein-right-leave-to {
30-
transform: translateX(20px);
31-
opacity: 0;
32-
}
33-
34-
.slide-fadein-left-leave-to,
35-
.slide-fadein-right-enter-from {
36-
transform: translateX(-20px);
37-
opacity: 0;
38-
}

app/types/index.d.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)