Skip to content

Commit 90ab115

Browse files
committed
fixed #201
1 parent c8bd4ac commit 90ab115

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/router/index.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,19 @@ router.beforeEach((to, from, next) => {
5353
}
5454
})
5555

56-
router.afterEach(to => {
56+
57+
58+
router.afterEach(async to => {
5759
// 进度条
5860
NProgress.done()
61+
// 等待数据加载 https://github.com/d2-projects/d2-admin/issues/201
62+
await new Promise (resolve => {
63+
const timer = setInterval(() => {
64+
if (store.state.d2admin.page.openedLoaded) {
65+
resolve(clearInterval(timer))
66+
}
67+
}, 10)
68+
})
5969
// 多页控制 打开新的页面
6070
store.dispatch('d2admin/page/open', to)
6171
// 更改标题

src/store/modules/d2admin/modules/page.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export default {
1212
pool: [],
1313
// 当前显示的多页面列表
1414
opened: setting.page.opened,
15+
// 标记已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
16+
openedLoaded: false,
1517
// 当前页面
1618
current: '',
1719
// 需要缓存的页面 name
@@ -52,6 +54,8 @@ export default {
5254
// 新的数据中一般不会携带 params 和 query, 所以旧的参数会留存
5355
return Object.assign({}, opened, find)
5456
}).filter((opened, index) => valid[index] === 1)
57+
// 标记已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
58+
state.openedLoaded = true
5559
// 根据 opened 数据生成缓存设置
5660
commit('keepAliveRefresh')
5761
// end

0 commit comments

Comments
 (0)