Former-commit-id: 553d22bc2ba6a095e0d1667e70db497816e102c2 [formerly 553d22bc2ba6a095e0d1667e70db497816e102c2 [formerly 553d22bc2ba6a095e0d1667e70db497816e102c2 [formerly 553d22bc2ba6a095e0d1667e70db497816e102c2 [formerly be58b4c910710a1067ee07bbf2fedd515d94dff8 [formerly 206041f166f2525d783041c2e5db14c37e5f6392]]]]]
Former-commit-id: 086628abb7a77b20f8e0d973d3ef09be9d392810
Former-commit-id: b67bf6ad83f4546de9fcbf455dd498ee73ffd8ec
Former-commit-id: 6f47fb5c2b7d1804fac39e8f0c7fba280964ac9c [formerly 344e5b1af573b8320a6a3881aab28e2ad412c6e6]
Former-commit-id: b2ab2bd7a19e5cde49e78431125bc2847fc9272c
Former-commit-id: 0cb0c74ef934a7d23cb8a710e98b4e58583a4713
Former-commit-id: 5a417644c344269ea2ec26929531f1f5464d2c26
Former-commit-id: d2cd0166b2796e29bdb54bbacdf2df5775eb2990
Former-commit-id: 2c800218a2dc22835b7e46b094349d92a925f823
This commit is contained in:
liyang
2018-08-09 15:49:39 +08:00
parent 2418411047
commit aa1fa7932f
6 changed files with 51 additions and 28 deletions

View File

@@ -2,7 +2,7 @@
<div
class="d2-layout-header-aside-group"
:style="styleLayoutMainGroup"
:class="{grayMode: isGrayMode}">
:class="{grayMode: grayActive}">
<!-- 半透明遮罩 -->
<div class="d2-layout-header-aside-mask"></div>
<!-- 主体内容 -->
@@ -78,13 +78,11 @@ export default {
}
},
computed: {
...mapState('d2admin', [
'isGrayMode',
'pageOpenedList'
]),
...mapState('d2admin/menu', [
'asideCollapse'
]),
...mapState('d2admin', {
grayActive: state => state.gray.active,
pageOpenedList: 'pageOpenedList',
asideCollapse: state => state.menu.asideCollapse
}),
...mapGetters('d2admin', {
keepAliveInclude: 'keepAliveInclude',
themeActiveSetting: 'theme/activeSetting'