Merge branch 'feature/store-module' into develop
# Conflicts: # src/pages/demo/playground/store/menu/index.vue Former-commit-id: 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 6ebe5372a382d911bdbe82f5a1867f72ab58f286 [formerly f7811326ccd36bd64b92f6c3094060be390a2b76]]]]] Former-commit-id: 1a0ec7498901cca64a7d12c2b2c8f13ae701ca21 Former-commit-id: 3531de0dd9e330312c5073676f4c3aa82d28dfb9 Former-commit-id: cc70c17a885ff8b72df8b799921e38fbcbedd3e9 [formerly 73282cfd24758da343bea77d413773d569606110] Former-commit-id: fa461f51727fdfc67b8ae790e1f0df161f85ca8b Former-commit-id: 10e2f2cfce4a446c01957229fe254e4c5ec211a6 Former-commit-id: 602f7a473458e6f5f0d5ec96388e608971daca34 Former-commit-id: bb4a69677e9c9a76c8f653fb2b7c714eff13fa67 Former-commit-id: 277ce50885de084a418ba885418c22e8978e3c22
This commit is contained in:
12
src/main.js
12
src/main.js
@@ -51,17 +51,17 @@ new Vue({
|
||||
// 处理路由 得到每一级的路由设置
|
||||
this.getAllPageFromRoutes()
|
||||
// 设置顶栏菜单
|
||||
this.$store.commit('d2adminMenuHeaderSet', menuHeader)
|
||||
this.$store.commit('d2admin/menu/headerSet', menuHeader)
|
||||
},
|
||||
mounted () {
|
||||
// D2Admin 开发环境检查更新
|
||||
util.checkUpdate(this)
|
||||
// 获取并记录用户 UA
|
||||
this.$store.commit('d2adminUaGet')
|
||||
this.$store.commit('d2admin/ua/get')
|
||||
// 展示系统信息
|
||||
util.showInfo()
|
||||
// 用户登陆后从数据库加载一系列的设置
|
||||
this.$store.commit('d2adminLoginSuccessLoad')
|
||||
this.$store.commit('d2admin/account/load')
|
||||
// 初始化全屏监听
|
||||
this.fullscreenListenerInit()
|
||||
},
|
||||
@@ -69,7 +69,7 @@ new Vue({
|
||||
// 监听路由 控制侧边栏显示
|
||||
'$route.matched' (val) {
|
||||
const _side = menuAside.filter(menu => menu.path === val[0].path)
|
||||
this.$store.commit('d2adminMenuAsideSet', _side.length > 0 ? _side[0].children : [])
|
||||
this.$store.commit('d2admin/menu/asideSet', _side.length > 0 ? _side[0].children : [])
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -80,7 +80,7 @@ new Vue({
|
||||
if (screenfull.enabled) {
|
||||
screenfull.on('change', () => {
|
||||
if (!screenfull.isFullscreen) {
|
||||
this.$store.commit('d2adminFullScreenSet', false)
|
||||
this.$store.commit('d2admin/fullscreen/set', false)
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -101,7 +101,7 @@ new Vue({
|
||||
})
|
||||
}
|
||||
push(frameInRoutes)
|
||||
this.$store.commit('d2adminPagePoolSet', pool)
|
||||
this.$store.commit('d2admin/page/poolSet', pool)
|
||||
}
|
||||
}
|
||||
}).$mount('#app')
|
||||
|
||||
Reference in New Issue
Block a user