Skip to content

Commit 7651ec9

Browse files
committed
fix: rename vars
1 parent 87045e9 commit 7651ec9

File tree

6 files changed

+23
-22
lines changed

6 files changed

+23
-22
lines changed

src/components/menu/SideMenu.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<a-layout-sider
3-
:class="['sider', device === 'desktop' ? null : 'shadow', theme, fixedSideMenu ? 'ant-fixed-sidemenu' : null ]"
3+
:class="['sider', device === 'desktop' ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
44
width="256px"
55
:collapsible="collapsible"
66
v-model="collapsed"
@@ -58,7 +58,7 @@
5858
computed: {
5959
...mapState({
6060
device: state => state.app.device,
61-
fixedSideMenu: state => state.app.fixedSideMenu,
61+
fixSiderbar: state => state.app.fixSiderbar,
6262
})
6363
},
6464
methods: {

src/components/page/GlobalHeader.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@
9191
mainMenu: state => state.permission.addRouters,
9292
sidebarOpened: state => state.app.sidebar.opened,
9393
fixedHeader: state => state.app.fixedHeader,
94-
swipeDownHiddenHeader: state => state.app.swipeDownHiddenHeader,
94+
autoHideHeader: state => state.app.autoHideHeader,
9595
}),
9696
},
9797
methods: {
9898
handleScroll () {
99-
if (this.swipeDownHiddenHeader) {
99+
if (this.autoHideHeader) {
100100
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
101101
if (scrollTop > 100) {
102102
this.headerBarFixed = true

src/components/page/GlobalLayout.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</a-drawer>
4848
</template>
4949

50-
<a-layout :class="[layoutMode]" :style="{ paddingLeft: fixedSideMenu && device === 'desktop' ? `${sidebarOpened ? 256 : 80}px` : '0' }">
50+
<a-layout :class="[layoutMode]" :style="{ paddingLeft: fixSiderbar && device === 'desktop' ? `${sidebarOpened ? 256 : 80}px` : '0' }">
5151
<!-- layout header -->
5252
<global-header :mode="layoutMode" :theme="theme" :collapsed="collapsed" :device="device" @toggle="toggle"/>
5353

@@ -97,7 +97,7 @@
9797
layoutMode: state => state.app.layout,
9898
sidebarOpened: state => state.app.sidebar.opened,
9999
fixedHeader: state => state.app.fixedHeader,
100-
fixedSideMenu: state => state.app.fixedSideMenu,
100+
fixSiderbar: state => state.app.fixSiderbar,
101101
theme: state => state.app.theme,
102102
device: state => state.app.device,
103103
})

src/components/setting/SettingDrawer.vue

+9-8
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@
103103
</a-list-item-meta>
104104
</a-list-item>
105105
<a-list-item>
106-
<a-switch slot="actions" size="small" :defaultChecked="swipeDownHiddenHeader" @change="handleFixedHeaderHidden" />
106+
<a-switch slot="actions" size="small" :defaultChecked="autoHideHeader" @change="handleFixedHeaderHidden" />
107107
<a-list-item-meta>
108108
<div slot="title">下滑时隐藏 Header</div>
109109
</a-list-item-meta>
110110
</a-list-item>
111111
<a-list-item >
112-
<a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :defaultChecked="fixedSideMenu" @change="handleFixedSideMenu" />
112+
<a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :defaultChecked="fixSiderbar" @change="handleFixSiderbar" />
113113
<a-list-item-meta>
114114
<div slot="title" :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }">固定侧边菜单</div>
115115
</a-list-item-meta>
@@ -175,8 +175,8 @@
175175
primaryColor: state => state.app.color,
176176
colorWeak: state => state.app.weak,
177177
fixedHeader: state => state.app.fixedHeader,
178-
fixedSideMenu: state => state.app.fixedSideMenu,
179-
swipeDownHiddenHeader: state => state.app.swipeDownHiddenHeader,
178+
fixSiderbar: state => state.app.fixSiderbar,
179+
autoHideHeader: state => state.app.autoHideHeader,
180180
})
181181
},
182182
mounted () {
@@ -215,7 +215,8 @@
215215
handleLayout (mode) {
216216
this.$store.dispatch('ToggleLayoutMode', mode)
217217
// 因为顶部菜单不能固定左侧菜单栏,所以强制关闭
218-
this.handleFixedSideMenu(false);
218+
//
219+
this.handleFixSiderbar(false);
219220
},
220221
changeColor (color) {
221222
if (this.primaryColor !== color) {
@@ -229,12 +230,12 @@
229230
handleFixedHeaderHidden (autoHidden) {
230231
this.$store.dispatch('ToggleFixedHeaderHidden', autoHidden)
231232
},
232-
handleFixedSideMenu (fixed) {
233+
handleFixSiderbar (fixed) {
233234
if (this.layoutMode === 'topmenu') {
234-
this.$store.dispatch('ToggleFixedSidemenu', false)
235+
this.$store.dispatch('ToggleFixSiderbar', false)
235236
return;
236237
}
237-
this.$store.dispatch('ToggleFixedSidemenu', fixed)
238+
this.$store.dispatch('ToggleFixSiderbar', fixed)
238239
}
239240
},
240241
}

src/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ new Vue({
4141
store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme))
4242
store.commit('TOGGLE_LAYOUT_MODE', Vue.ls.get(DEFAULT_LAYOUT_MODE, config.layout))
4343
store.commit('TOGGLE_FIXED_HEADER', Vue.ls.get(DEFAULT_FIXED_HEADER, config.fixedHeader))
44-
store.commit('TOGGLE_FIXED_SIDEMENU', Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar))
44+
store.commit('TOGGLE_FIXED_SIDERBAR', Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar))
4545
store.commit('TOGGLE_FIXED_HEADER_HIDDEN', Vue.ls.get(DEFAULT_FIXED_HEADER_HIDDEN, config.autoHideHeader))
4646
store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak))
4747
store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))

src/store/modules/app.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const app = {
1111
theme: '',
1212
layout: '',
1313
fixedHeader: false,
14-
fixedSideMenu: false,
15-
swipeDownHiddenHeader: false,
14+
fixSiderbar: false,
15+
autoHideHeader: false,
1616
color: null,
1717
weak: false
1818
},
@@ -42,13 +42,13 @@ const app = {
4242
Vue.ls.set(DEFAULT_FIXED_HEADER, fixed)
4343
state.fixedHeader = fixed
4444
},
45-
TOGGLE_FIXED_SIDEMENU: (state, fixed) => {
45+
TOGGLE_FIXED_SIDERBAR: (state, fixed) => {
4646
Vue.ls.set(DEFAULT_FIXED_SIDEMENU, fixed)
47-
state.fixedSideMenu = fixed
47+
state.fixSiderbar = fixed
4848
},
4949
TOGGLE_FIXED_HEADER_HIDDEN: (state, show) => {
5050
Vue.ls.set(DEFAULT_FIXED_HEADER_HIDDEN, show)
51-
state.swipeDownHiddenHeader = show
51+
state.autoHideHeader = show
5252
},
5353

5454
TOGGLE_COLOR: (state, color) => {
@@ -79,8 +79,8 @@ const app = {
7979
ToggleFixedHeader({ commit }, fixedHeader) {
8080
commit('TOGGLE_FIXED_HEADER', fixedHeader)
8181
},
82-
ToggleFixedSidemenu({ commit }, fixedSideMenu) {
83-
commit( 'TOGGLE_FIXED_SIDEMENU', fixedSideMenu)
82+
ToggleFixSiderbar({ commit }, fixSiderbar) {
83+
commit( 'TOGGLE_FIXED_SIDERBAR', fixSiderbar)
8484
},
8585
ToggleFixedHeaderHidden({ commit }, show) {
8686
commit('TOGGLE_FIXED_HEADER_HIDDEN', show)

0 commit comments

Comments
 (0)