提交 fef36440 编写于 作者: V vben

fix: page switching did not return to the top

上级 f4621cc6
import { isNavigationFailure, Router } from 'vue-router'; import { isNavigationFailure, RouteLocationNormalized, Router } from 'vue-router';
import { Modal, notification } from 'ant-design-vue'; import { Modal, notification } from 'ant-design-vue';
...@@ -19,6 +19,12 @@ import { REDIRECT_NAME } from '/@/router/constant'; ...@@ -19,6 +19,12 @@ import { REDIRECT_NAME } from '/@/router/constant';
const { closeMessageOnSwitch, removeAllHttpPending } = useProjectSetting(); const { closeMessageOnSwitch, removeAllHttpPending } = useProjectSetting();
const globSetting = useGlobSetting(); const globSetting = useGlobSetting();
const body = document.body;
const isHash = (href: string) => {
return /^#/.test(href);
};
export function createGuard(router: Router) { export function createGuard(router: Router) {
let axiosCanceler: Nullable<AxiosCanceler>; let axiosCanceler: Nullable<AxiosCanceler>;
if (removeAllHttpPending) { if (removeAllHttpPending) {
...@@ -45,8 +51,13 @@ export function createGuard(router: Router) { ...@@ -45,8 +51,13 @@ export function createGuard(router: Router) {
}); });
router.afterEach((to, from, failure) => { router.afterEach((to, from, failure) => {
// scroll top
isHash((to as RouteLocationNormalized & { href: string })?.href) && body.scrollTo(0, 0);
loadedPageMap.set(to.path, true); loadedPageMap.set(to.path, true);
const { t } = useI18n(); const { t } = useI18n();
// change html title // change html title
to.name !== REDIRECT_NAME && setTitle(t(to.meta.title), globSetting.title); to.name !== REDIRECT_NAME && setTitle(t(to.meta.title), globSetting.title);
......
...@@ -8,9 +8,11 @@ import { createGuard } from './guard/'; ...@@ -8,9 +8,11 @@ import { createGuard } from './guard/';
import { basicRoutes } from './routes/'; import { basicRoutes } from './routes/';
import { scrollBehavior } from './scrollBehaviour'; import { scrollBehavior } from './scrollBehaviour';
export const hashRouter = createWebHashHistory();
// app router // app router
const router = createRouter({ const router = createRouter({
history: createWebHashHistory(), history: hashRouter,
routes: basicRoutes as RouteRecordRaw[], routes: basicRoutes as RouteRecordRaw[],
strict: true, strict: true,
scrollBehavior: scrollBehavior, scrollBehavior: scrollBehavior,
......
// see https://github.com/vuejs/vue-router-next/blob/master/playground/scrollWaiter.ts
import type { RouteLocationNormalized } from 'vue-router';
// class ScrollQueue {
// private resolve: (() => void) | null = null;
// private promise: Promise<any> | null = null;
// add() {
// this.promise = new Promise((resolve) => {
// this.resolve = resolve as () => void;
// });
// }
// flush() {
// this.resolve && this.resolve();
// this.resolve = null;
// this.promise = null;
// }
// async wait() {
// await this.promise;
// }
// }
// const scrollWaiter = new ScrollQueue();
/** /**
* Handles the scroll behavior on route navigation * Handles the scroll behavior on route navigation
* *
...@@ -8,10 +32,9 @@ ...@@ -8,10 +32,9 @@
*/ */
// @ts-ignore // @ts-ignore
export async function scrollBehavior(to, from, savedPosition) { export async function scrollBehavior(to, from, savedPosition) {
await scrollWaiter.wait(); // await scrollWaiter.wait();
// Use predefined scroll behavior if defined, defaults to no scroll behavior // Use predefined scroll behavior if defined, defaults to no scroll behavior
const behavior = document.documentElement.style.scrollBehavior || 'auto'; const behavior = 'smooth';
// Returning the `savedPosition` (if available) will result in a native-like // Returning the `savedPosition` (if available) will result in a native-like
// behavior when navigating with back/forward buttons // behavior when navigating with back/forward buttons
if (savedPosition) { if (savedPosition) {
...@@ -24,7 +47,7 @@ export async function scrollBehavior(to, from, savedPosition) { ...@@ -24,7 +47,7 @@ export async function scrollBehavior(to, from, savedPosition) {
} }
// Check if any matched route config has meta that discourages scrolling to top // Check if any matched route config has meta that discourages scrolling to top
if (to.matched.some((m: any) => m.meta.scrollToTop === false)) { if (to.matched.some((m: RouteLocationNormalized) => m.meta.scrollToTop === false)) {
// Leave scroll as it is // Leave scroll as it is
return false; return false;
} }
...@@ -32,27 +55,3 @@ export async function scrollBehavior(to, from, savedPosition) { ...@@ -32,27 +55,3 @@ export async function scrollBehavior(to, from, savedPosition) {
// Always scroll to top // Always scroll to top
return { left: 0, top: 0, behavior }; return { left: 0, top: 0, behavior };
} }
// see https://github.com/vuejs/vue-router-next/blob/master/playground/scrollWaiter.ts
class ScrollQueue {
private resolve: (() => void) | null = null;
private promise: Promise<any> | null = null;
add() {
this.promise = new Promise((resolve) => {
this.resolve = resolve as () => void;
});
}
flush() {
this.resolve && this.resolve();
this.resolve = null;
this.promise = null;
}
async wait() {
await this.promise;
}
}
export const scrollWaiter = new ScrollQueue();
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册