fix https://github.com/d2-projects/d2-admin/issues/198

Former-commit-id: a90637e57de8a016135aeb5b4d43d1db78eed7b1 [formerly df1374a5bf87d104dc2f41a1f6eeb6ba075c2923] [formerly a90637e57de8a016135aeb5b4d43d1db78eed7b1 [formerly df1374a5bf87d104dc2f41a1f6eeb6ba075c2923] [formerly a90637e57de8a016135aeb5b4d43d1db78eed7b1 [formerly df1374a5bf87d104dc2f41a1f6eeb6ba075c2923] [formerly df1374a5bf87d104dc2f41a1f6eeb6ba075c2923 [formerly 6b854444d7f338481165fc1c4c999f866282958e [formerly 1371e68396bb244a22bc579bb55f12e5b6c40809]]]]]
Former-commit-id: 1815aa974e40b1de51ad22359615b8d169793ba1
Former-commit-id: 30a07d937aca2e3156551b823c72dea29188314e
Former-commit-id: 4180971ccf5277ea71eb8864df232fc3faf1f4d3 [formerly 8b4d133ffebc9382606ef6bd19c35415a8a88422]
Former-commit-id: 0399bc6935c57909850285c807624a04ed919690
Former-commit-id: c5a7c8f7e5c4b8945a096e8b2a9b362817e3e49b
Former-commit-id: 6195d04a71287b56282310563694e59578ef7f3b
Former-commit-id: 9b75da52937cce80ef16fc6e1ab20777723be3f8
Former-commit-id: 6ec6d677cc099762d68ef23332a5845085aa0c57

src/router/index.js

@@ -23,7 +23,17 @@ const router = new VueRouter({
  * 路由拦截
  * 权限验证
  */
-router.beforeEach((to, from, next) => {
+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
+  await store.dispatch('d2admin/size/isLoaded')
   // 进度条
   NProgress.start()
   // 关闭搜索面板
@@ -55,17 +65,9 @@ router.beforeEach((to, from, next) => {
 
 
 
-router.afterEach(async to => {
+router.afterEach(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)
   // 更改标题