diff --git a/src/router/index.js b/src/router/index.js index 2e11da2c..3ac0a9cb 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,9 +53,19 @@ router.beforeEach((to, from, next) => { } }) -router.afterEach(to => { + + +router.afterEach(async to => { // 进度条 NProgress.done() + // 等待数据加载 https://github.com/d2-projects/d2-admin/issues/201 + await new Promise (resolve => { + const timer = setInterval(() => { + if (store.state.d2admin.page.openedLoaded) { + resolve(clearInterval(timer)) + } + }, 10) + }) // 多页控制 打开新的页面 store.dispatch('d2admin/page/open', to) // 更改标题 diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id index 3e120cae..960129f9 100644 --- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id +++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id @@ -1 +1 @@ -5b4bf07ec22910d05c962db24c6b381e9714e575 \ No newline at end of file +9497ec44eb1bff086d98a4917a8aba46abed1fe0 \ No newline at end of file