Commit 7651ec99 by Sendya

fix: rename vars

parent 87045e97
<template>
<a-layout-sider
:class="['sider', device === 'desktop' ? null : 'shadow', theme, fixedSideMenu ? 'ant-fixed-sidemenu' : null ]"
:class="['sider', device === 'desktop' ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
width="256px"
:collapsible="collapsible"
v-model="collapsed"
......@@ -58,7 +58,7 @@
computed: {
...mapState({
device: state => state.app.device,
fixedSideMenu: state => state.app.fixedSideMenu,
fixSiderbar: state => state.app.fixSiderbar,
})
},
methods: {
......
......@@ -91,12 +91,12 @@
mainMenu: state => state.permission.addRouters,
sidebarOpened: state => state.app.sidebar.opened,
fixedHeader: state => state.app.fixedHeader,
swipeDownHiddenHeader: state => state.app.swipeDownHiddenHeader,
autoHideHeader: state => state.app.autoHideHeader,
}),
},
methods: {
handleScroll () {
if (this.swipeDownHiddenHeader) {
if (this.autoHideHeader) {
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
if (scrollTop > 100) {
this.headerBarFixed = true
......
......@@ -47,7 +47,7 @@
</a-drawer>
</template>
<a-layout :class="[layoutMode]" :style="{ paddingLeft: fixedSideMenu && device === 'desktop' ? `${sidebarOpened ? 256 : 80}px` : '0' }">
<a-layout :class="[layoutMode]" :style="{ paddingLeft: fixSiderbar && device === 'desktop' ? `${sidebarOpened ? 256 : 80}px` : '0' }">
<!-- layout header -->
<global-header :mode="layoutMode" :theme="theme" :collapsed="collapsed" :device="device" @toggle="toggle"/>
......@@ -97,7 +97,7 @@
layoutMode: state => state.app.layout,
sidebarOpened: state => state.app.sidebar.opened,
fixedHeader: state => state.app.fixedHeader,
fixedSideMenu: state => state.app.fixedSideMenu,
fixSiderbar: state => state.app.fixSiderbar,
theme: state => state.app.theme,
device: state => state.app.device,
})
......
......@@ -103,13 +103,13 @@
</a-list-item-meta>
</a-list-item>
<a-list-item>
<a-switch slot="actions" size="small" :defaultChecked="swipeDownHiddenHeader" @change="handleFixedHeaderHidden" />
<a-switch slot="actions" size="small" :defaultChecked="autoHideHeader" @change="handleFixedHeaderHidden" />
<a-list-item-meta>
<div slot="title">下滑时隐藏 Header</div>
</a-list-item-meta>
</a-list-item>
<a-list-item >
<a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :defaultChecked="fixedSideMenu" @change="handleFixedSideMenu" />
<a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :defaultChecked="fixSiderbar" @change="handleFixSiderbar" />
<a-list-item-meta>
<div slot="title" :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }">固定侧边菜单</div>
</a-list-item-meta>
......@@ -175,8 +175,8 @@
primaryColor: state => state.app.color,
colorWeak: state => state.app.weak,
fixedHeader: state => state.app.fixedHeader,
fixedSideMenu: state => state.app.fixedSideMenu,
swipeDownHiddenHeader: state => state.app.swipeDownHiddenHeader,
fixSiderbar: state => state.app.fixSiderbar,
autoHideHeader: state => state.app.autoHideHeader,
})
},
mounted () {
......@@ -215,7 +215,8 @@
handleLayout (mode) {
this.$store.dispatch('ToggleLayoutMode', mode)
// 因为顶部菜单不能固定左侧菜单栏,所以强制关闭
this.handleFixedSideMenu(false);
//
this.handleFixSiderbar(false);
},
changeColor (color) {
if (this.primaryColor !== color) {
......@@ -229,12 +230,12 @@
handleFixedHeaderHidden (autoHidden) {
this.$store.dispatch('ToggleFixedHeaderHidden', autoHidden)
},
handleFixedSideMenu (fixed) {
handleFixSiderbar (fixed) {
if (this.layoutMode === 'topmenu') {
this.$store.dispatch('ToggleFixedSidemenu', false)
this.$store.dispatch('ToggleFixSiderbar', false)
return;
}
this.$store.dispatch('ToggleFixedSidemenu', fixed)
this.$store.dispatch('ToggleFixSiderbar', fixed)
}
},
}
......
......@@ -41,7 +41,7 @@ new Vue({
store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme))
store.commit('TOGGLE_LAYOUT_MODE', Vue.ls.get(DEFAULT_LAYOUT_MODE, config.layout))
store.commit('TOGGLE_FIXED_HEADER', Vue.ls.get(DEFAULT_FIXED_HEADER, config.fixedHeader))
store.commit('TOGGLE_FIXED_SIDEMENU', Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar))
store.commit('TOGGLE_FIXED_SIDERBAR', Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar))
store.commit('TOGGLE_FIXED_HEADER_HIDDEN', Vue.ls.get(DEFAULT_FIXED_HEADER_HIDDEN, config.autoHideHeader))
store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak))
store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))
......
......@@ -11,8 +11,8 @@ const app = {
theme: '',
layout: '',
fixedHeader: false,
fixedSideMenu: false,
swipeDownHiddenHeader: false,
fixSiderbar: false,
autoHideHeader: false,
color: null,
weak: false
},
......@@ -42,13 +42,13 @@ const app = {
Vue.ls.set(DEFAULT_FIXED_HEADER, fixed)
state.fixedHeader = fixed
},
TOGGLE_FIXED_SIDEMENU: (state, fixed) => {
TOGGLE_FIXED_SIDERBAR: (state, fixed) => {
Vue.ls.set(DEFAULT_FIXED_SIDEMENU, fixed)
state.fixedSideMenu = fixed
state.fixSiderbar = fixed
},
TOGGLE_FIXED_HEADER_HIDDEN: (state, show) => {
Vue.ls.set(DEFAULT_FIXED_HEADER_HIDDEN, show)
state.swipeDownHiddenHeader = show
state.autoHideHeader = show
},
TOGGLE_COLOR: (state, color) => {
......@@ -79,8 +79,8 @@ const app = {
ToggleFixedHeader({ commit }, fixedHeader) {
commit('TOGGLE_FIXED_HEADER', fixedHeader)
},
ToggleFixedSidemenu({ commit }, fixedSideMenu) {
commit( 'TOGGLE_FIXED_SIDEMENU', fixedSideMenu)
ToggleFixSiderbar({ commit }, fixSiderbar) {
commit( 'TOGGLE_FIXED_SIDERBAR', fixSiderbar)
},
ToggleFixedHeaderHidden({ commit }, show) {
commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment