diff --git a/src/router/index.js b/src/router/index.js index e3e0f001..e9adc225 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,15 +24,9 @@ const router = new VueRouter({ * 权限验证 */ router.beforeEach(async (to, from, next) => { - // 等待数据加载 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) - }) - // 等待加载组件尺寸 https://github.com/d2-projects/d2-admin/issues/198 + // 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201 + await store.dispatch('d2admin/page/isLoaded') + // 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198 await store.dispatch('d2admin/size/isLoaded') // 进度条 NProgress.start() 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 960129f9..3520f687 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 @@ -9497ec44eb1bff086d98a4917a8aba46abed1fe0 \ No newline at end of file +f6db6b641667fe94ef45b30706bc285c62e33d1b \ No newline at end of file diff --git a/src/store/modules/d2admin/modules/size.js b/src/store/modules/d2admin/modules/size.js index c2748acb..e5bdb4a6 100644 --- a/src/store/modules/d2admin/modules/size.js +++ b/src/store/modules/d2admin/modules/size.js @@ -20,7 +20,7 @@ export default { } }, /** - * @description 确认组件尺寸已经加载 https://github.com/d2-projects/d2-admin/issues/198 + * @description 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198 */ isLoaded ({ state }) { if (state.value) return Promise.resolve()