no message

Former-commit-id: a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly f244e1fdd164c1b79a79bb5a6b747ee86b9d8589 [formerly 9a88fe535b9d40bff1dcca1e9c312ab81c0961b5]]]]]
Former-commit-id: 80f45f42407a12231dcb32861eae95da8b8f27d5
Former-commit-id: 294d0beb7890b73dd462900f6634b9ed43dda50b
Former-commit-id: f639bbc1de8e27b18262e84545ff22b8556c402a [formerly 0f01b98c3d1b41eaa511bb56813d860105da930f]
Former-commit-id: 9a33c6b83d309a76711c4fad397c149dac55a8b5
Former-commit-id: f556363312d2e505acc24ec531e787fc3863f9fc
Former-commit-id: 4433f382bc7c25d437eabfab96e4a7b0dbca28b5
Former-commit-id: eb558eb22372f558e8d93ae8dac07c40016e2644
Former-commit-id: 963b8effbe52965ae14a77172a37c50dcfd6cf56
This commit is contained in:
liyang
2018-09-14 15:09:58 +08:00
parent b08fe0fc37
commit a7af1acbf4
5 changed files with 12 additions and 16 deletions

View File

@@ -21,7 +21,7 @@
</template> </template>
<script> <script>
import { mapState, mapMutations, mapActions } from 'vuex' import { mapState, mapActions } from 'vuex'
export default { export default {
name: 'd2-header-size', name: 'd2-header-size',
computed: { computed: {
@@ -38,7 +38,7 @@ export default {
// 设置 element 全局尺寸 // 设置 element 全局尺寸
this.$ELEMENT.size = val this.$ELEMENT.size = val
// 清空缓存设置 // 清空缓存设置
this.keepAliveClean() this.pageKeepAliveClean()
// 刷新此页面 // 刷新此页面
const { path, query } = this.$route const { path, query } = this.$route
this.$router.replace({ this.$router.replace({
@@ -50,14 +50,12 @@ export default {
} }
}, },
methods: { methods: {
...mapMutations('d2admin/page', [ ...mapActions({
'keepAliveClean' pageKeepAliveClean: 'd2admin/page/keepAliveClean',
]), sizeSet: 'd2admin/size/set'
...mapActions('d2admin/size', [ }),
'set'
]),
handleChange (value) { handleChange (value) {
this.set(value) this.sizeSet(value)
}, },
iconName (name) { iconName (name) {
return name === this.value ? 'dot-circle-o' : 'circle-o' return name === this.value ? 'dot-circle-o' : 'circle-o'

View File

@@ -59,7 +59,7 @@
</template> </template>
<script> <script>
import { mapState, mapMutations } from 'vuex' import { mapState, mapActions } from 'vuex'
export default { export default {
components: { components: {
D2Contextmenu: () => import('../contextmenu'), D2Contextmenu: () => import('../contextmenu'),
@@ -89,7 +89,7 @@ export default {
]) ])
}, },
methods: { methods: {
...mapMutations('d2admin/page', [ ...mapActions('d2admin/page', [
'close', 'close',
'closeLeft', 'closeLeft',
'closeRight', 'closeRight',
@@ -101,7 +101,6 @@ export default {
*/ */
handleContextmenu (event) { handleContextmenu (event) {
let target = event.target let target = event.target
// 解决 https://github.com/d2-projects/d2-admin/issues/54 // 解决 https://github.com/d2-projects/d2-admin/issues/54
let flag = false let flag = false
if (target.className.indexOf('el-tabs__item') > -1) flag = true if (target.className.indexOf('el-tabs__item') > -1) flag = true
@@ -109,7 +108,6 @@ export default {
target = target.parentNode target = target.parentNode
flag = true flag = true
} }
if (flag) { if (flag) {
event.preventDefault() event.preventDefault()
event.stopPropagation() event.stopPropagation()

View File

@@ -57,7 +57,7 @@ router.afterEach(to => {
const app = router.app const app = router.app
const { name, params, query } = to const { name, params, query } = to
// 多页控制 打开新的页面 // 多页控制 打开新的页面
app.$store.commit('d2admin/page/open', { name, params, query }) app.$store.dispatch('d2admin/page/open', { name, params, query })
// 更改标题 // 更改标题
util.title(to.meta.title) util.title(to.meta.title)
}) })

View File

@@ -102,7 +102,7 @@ export default {
// DB -> store 加载页面过渡效果设置 // DB -> store 加载页面过渡效果设置
await dispatch('d2admin/transition/load', null, { root: true }) await dispatch('d2admin/transition/load', null, { root: true })
// DB -> store 持久化数据加载上次退出时的多页列表 // DB -> store 持久化数据加载上次退出时的多页列表
commit('d2admin/page/openedLoad', null, { root: true }) await dispatch('d2admin/page/openedLoad', null, { root: true })
// DB -> store 持久化数据加载侧边栏折叠状态 // DB -> store 持久化数据加载侧边栏折叠状态
await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true }) await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
// DB -> store 持久化数据加载全局尺寸 // DB -> store 持久化数据加载全局尺寸

View File

@@ -1 +1 @@
9abf067fc9ee38d5c28f4b1450b9df450c2583bc 3cac6fb289611555b60a92937c3b5ba99e7b9ec1