sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

util user menu releases

Browse Source 
Former-commit-id: 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly cd607a12b20a3d53a1967ee6012a35e03e3d31fe [formerly 645a010d0d8f84a370c509c39c560d93eaa8ae4f]]]]]
Former-commit-id: fd4e72b6a4dc7cb2731c0b5fbf343dab6c251d3f
Former-commit-id: 68305cd58cbd1927373a79c1b507de3c4f3d9924
Former-commit-id: 48312890868f48d5524b0de0dda489f2b2c57b0a [formerly fec91cd8f508ffe42c5e254dcee018c879f3d51e]
Former-commit-id: 9e300a2baafd1eae86bb69a052f15b904724856e
Former-commit-id: eaafbb0a410a49a286eb8e666b6784b96c9df371
Former-commit-id: ccef5438dddbe9762bd3574b33aab49bc1edee58
Former-commit-id: d2ca5c406860c43079d78a80d18ca2b1ed87f776
Former-commit-id: d4648c6865bff45b24aea999b60381b78417b802
This commit is contained in:
liyang
2018-08-08 16:04:10 +08:00
parent 8ef8ae0ca4
commit 5a91ab709f
15 changed files with 317 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/pages/demo/playground/store/menu/index.vue
View File

@@ -6,18 +6,11 @@
<el-card shadow="never" class="d2-card">
<template slot="header">顶栏菜单</template>
<el-button-group class="d2-mb">
<el-button @click="handleMenuHeaderSet">设置空菜单</el-button>
<el-button @click="menuHeaderReset">恢复</el-button>
<el-button @click="handleHeaderSet">设置空菜单</el-button>
<el-button @click="headerReset">恢复</el-button>
</el-button-group>
<div style="height: 400px; overflow: auto;">
<d2-highlight :code="JSON.stringify(menuHeader, null, 2)"/>
<!-- <tree-view
class="tree-view-small"
:data="menuHeader"
:options="{
rootObjectKey: 'menuHeader',
maxDepth: 1
}"/> -->
<d2-highlight :code="JSON.stringify(header, null, 2)"/>
</div>
</el-card>
</el-col>
@@ -25,18 +18,11 @@
<el-card shadow="never" class="d2-card">
<template slot="header">侧栏菜单</template>
<el-button-group class="d2-mb">
<el-button @click="handleMenuAsideSet">设置空菜单</el-button>
<el-button @click="menuAsideReset">恢复</el-button>
<el-button @click="handleAsideSet">设置空菜单</el-button>
<el-button @click="asideReset">恢复</el-button>
</el-button-group>
<div style="height: 400px; overflow: auto;">
<d2-highlight :code="JSON.stringify(menuAside, null, 2)"/>
<!-- <tree-view
class="tree-view-small"
:data="menuAside"
:options="{
rootObjectKey: 'menuAside',
maxDepth: 1
}"/> -->
<d2-highlight :code="JSON.stringify(aside, null, 2)"/>
</div>
</el-card>
</el-col>
@@ -67,26 +53,26 @@ export default {
]
}
],
menuHeaderChanged: false,
menuAsideChanged: false,
menuHeaderBak: [],
menuAsideBak: []
headerChanged: false,
asideChanged: false,
headerBak: [],
asideBak: []
}
},
computed: {
...mapState('d2admin', [
'menuHeader',
'menuAside'
...mapState('d2admin/menu', [
'header',
'aside'
])
},
created () {
this.menuHeaderBak = clonedeep(this.menuHeader)
this.menuAsideBak = clonedeep(this.menuAside)
this.headerBak = clonedeep(this.header)
this.asideBak = clonedeep(this.aside)
},
beforeDestroy () {
if (this.menuHeaderChanged && this.menuAsideChanged) {
this.menuHeaderSet(this.menuHeaderBak)
this.menuAsideSet(this.menuAsideBak)
if (this.headerChanged && this.asideChanged) {
this.headerSet(this.headerBak)
this.asideSet(this.asideBak)
this.$notify({
title: '菜单恢复',
message: '对侧边栏和顶栏菜单的修改已经复原',
@@ -94,8 +80,8 @@ export default {
})
return
}
if (this.menuHeaderChanged) {
this.menuHeaderSet(this.menuHeaderBak)
if (this.headerChanged) {
this.headerSet(this.headerBak)
this.$notify({
title: '菜单恢复',
message: '对顶栏菜单的修改已经复原',
@@ -103,8 +89,8 @@ export default {
})
return
}
if (this.menuAsideChanged) {
this.menuAsideSet(this.menuAsideBak)
if (this.asideChanged) {
this.asideSet(this.asideBak)
this.$notify({
title: '菜单恢复',
message: '对侧边栏菜单的修改已经复原',
@@ -113,16 +99,16 @@ export default {
}
},
methods: {
...mapMutations('d2admin', [
'menuHeaderSet',
'menuAsideSet'
...mapMutations('d2admin/menu', [
'headerSet',
'asideSet'
]),
/**
* 修改顶栏菜单
*/
handleMenuHeaderSet () {
this.menuHeaderChanged = true
this.menuHeaderSet(this.menuEmpty)
handleHeaderSet () {
this.headerChanged = true
this.headerSet(this.menuEmpty)
this.$notify({
title: '菜单修改',
message: '对顶栏菜单的修改已经生效',
@@ -132,9 +118,9 @@ export default {
/**
* 修改侧边栏菜单
*/
handleMenuAsideSet () {
this.menuAsideChanged = true
this.menuAsideSet(this.menuEmpty)
handleAsideSet () {
this.asideChanged = true
this.asideSet(this.menuEmpty)
this.$notify({
title: '菜单修改',
message: '对侧边栏菜单的修改已经生效',
@@ -144,8 +130,8 @@ export default {
/**
* 恢复顶栏菜单
*/
menuHeaderReset () {
this.menuHeaderSet(this.menuHeaderBak)
headerReset () {
this.headerSet(this.headerBak)
this.$notify({
title: '菜单恢复',
message: '对顶栏菜单的修改已经复原',
@@ -155,8 +141,8 @@ export default {
/**
* 恢复侧边栏菜单
*/
menuAsideReset () {
this.menuAsideSet(this.menuAsideBak)
asideReset () {
this.asideSet(this.asideBak)
this.$notify({
title: '菜单恢复',
message: '对侧边栏菜单的修改已经复原',

23
src/pages/demo/playground/store/sys/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<d2-container type="ghost">
<template slot="header">version {{version}} [ {{releasesUpdate ? '有新版本' : '已经是最新版本'}} ]</template>
<template slot="header">version {{releasesVersion}} [ {{releasesUpdate ? '有新版本' : '已经是最新版本'}} ]</template>
<div class="d2-mt d2-mr">
<el-row :gutter="20">
<el-col :span="12">
@@ -36,7 +36,7 @@
<el-col :span="8">
<el-card shadow="never" class="d2-card d2-mb">
<template slot="header">侧边栏折叠</template>
<el-switch v-model="isMenuAsideCollapse" active-text="收缩" inactive-text="展开" disabled/>
<el-switch v-model="menuAsideCollapse" active-text="收缩" inactive-text="展开" disabled/>
</el-card>
</el-col>
</el-row>
@@ -108,16 +108,21 @@
import { mapState, mapGetters } from 'vuex'
export default {
computed: {
...mapState('d2admin', {
// 用户信息
userInfo: state => state.user.userInfo,
// 版本
releasesVersion: state => state.releases.version,
releasesLatest: state => state.releases.latest,
releasesUpdate: state => state.releases.update,
// 菜单
menuHeader: state => state.menu.header,
menuAside: state => state.menu.aside,
menuAsideCollapse: state => state.menu.asideCollapse
}),
...mapState('d2admin', [
'userInfo',
'version',
'releasesLatest',
'releasesUpdate',
'menuHeader',
'menuAside',
'isFullScreen',
'isGrayMode',
'isMenuAsideCollapse',
'themeList',
'themeActiveName',
'pagePool',