From a3e47d657e7b6a0a23d1f3f6fe84751cdbeb5323 Mon Sep 17 00:00:00 2001
From: FairyEver <1711467488@qq.com>
Date: Mon, 15 Jul 2019 22:25:37 +0800
Subject: [PATCH] fixed #201

Former-commit-id: 7670649fb17b56af919c869f151c402c759d06e3 [formerly 7670649fb17b56af919c869f151c402c759d06e3 [formerly 7670649fb17b56af919c869f151c402c759d06e3 [formerly 7670649fb17b56af919c869f151c402c759d06e3 [formerly 8aa862cf56f5a216bef418811d4baa5cd2500772 [formerly 26f5245cdaaf64c6f6eb205b728149f4a5bc4c9d]]]]]
Former-commit-id: a0bc7d86a13336906ba461eaeb017eac3e9ab39e
Former-commit-id: ba183566c140e1e057cd5ce4d68c04e09547117f
Former-commit-id: ed585555dc6768164db843649cb29c7939b92c81 [formerly 4b45f853c1356db04b9e061dac3f681d2a96a570]
Former-commit-id: d7b1f345b1fd7ca6672e1959128cd6e8cc300257
Former-commit-id: a670f7e5f832294063a613c83bc0bcf0eeab7d91
Former-commit-id: 7a52a901bbcfb4b89fc3c16b07983e5fd28013d6
Former-commit-id: b397ab32ffde7ab5e55cf024be024d43ed3a5699
Former-commit-id: c444f717ca218ca437883ba3c03ca2c2cf0b32c0
---
 src/router/index.js                                  | 12 +++++++++++-
 .../modules/d2admin/modules/page.js.REMOVED.git-id   |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

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