github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: no processing bar for page jumps longer than 250ms (#539) 

Signed-off-by: Ryan Wang <i@ryanc.cc>
pull/541/head
Ryan Wang 2022-04-06 21:34:05 +08:00 committed by GitHub
parent 8c54bb3ed0
commit 5ed960f633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/router/guard/permissionGuard.js
View File

@ -15,9 +15,6 @@ router.beforeEach(async (to, from, next) => {
NProgress.start() NProgress.start()
}, 250) }, 250)
// set title meta
to.meta && typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`)
// check installation status // check installation status
if (store.getters.isInstalled === undefined) { if (store.getters.isInstalled === undefined) {
await store.dispatch('fetchIsInstalled') await store.dispatch('fetchIsInstalled')
@ -53,7 +50,6 @@ router.beforeEach(async (to, from, next) => {
} }
next() next()
onProgressTimerDone()
return return
} }
@ -72,7 +68,10 @@ router.beforeEach(async (to, from, next) => {
onProgressTimerDone() onProgressTimerDone()
}) })
router.afterEach(() => { router.afterEach(to => {
// set title meta
to.meta && typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`)
onProgressTimerDone() onProgressTimerDone()
}) })
@ -80,6 +79,6 @@ function onProgressTimerDone() {
if (progressTimer && progressTimer !== 0) { if (progressTimer && progressTimer !== 0) {
clearTimeout(progressTimer) clearTimeout(progressTimer)
progressTimer = null progressTimer = null
NProgress.done()
} }
NProgress.done()
} }