Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/router/guard/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { createStateGuard } from './stateGuard';
import nProgress from 'nprogress';
import projectSetting from '/@/settings/projectSetting';
import { createParamMenuGuard } from './paramMenuGuard';
import NProgress from '/@/utils/lib/progress';

// Don't change the order of creation
export function setupRouterGuard(router: Router) {
Expand Down Expand Up @@ -52,6 +53,8 @@ function createPageLoadingGuard(router: Router) {
const appStore = useAppStoreWithOut();
const { getOpenPageLoading } = useTransitionSetting();
router.beforeEach(async (to) => {
NProgress.start();

if (!userStore.getToken) {
return true;
}
Expand All @@ -67,6 +70,8 @@ function createPageLoadingGuard(router: Router) {
return true;
});
router.afterEach(async () => {
NProgress.done();

if (unref(getOpenPageLoading)) {
// TODO Looking for a better way
// The timer simulates the loading time to prevent flashing too fast,
Expand Down
16 changes: 16 additions & 0 deletions src/utils/lib/progress.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';

NProgress.configure({
// Changes the minimum percentage used upon starting
minimum: 0.1,
// Adjust animation settings using easing (a CSS easing string) and speed (in ms)
easing: 'ease',
speed: 500,
// Turn off loading spinner by setting it to false
showSpinner: false,
// Adjust how often to trickle/increment, in ms
trickleSpeed: 200,
});

export default NProgress;