Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ant-design-pro-vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tianzhuanghu
ant-design-pro-vue
Commits
7651ec99
Commit
7651ec99
authored
Nov 26, 2018
by
Sendya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: rename vars
parent
87045e97
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
22 deletions
+23
-22
SideMenu.vue
src/components/menu/SideMenu.vue
+2
-2
GlobalHeader.vue
src/components/page/GlobalHeader.vue
+2
-2
GlobalLayout.vue
src/components/page/GlobalLayout.vue
+2
-2
SettingDrawer.vue
src/components/setting/SettingDrawer.vue
+9
-8
main.js
src/main.js
+1
-1
app.js
src/store/modules/app.js
+7
-7
No files found.
src/components/menu/SideMenu.vue
View file @
7651ec99
<
template
>
<
template
>
<a-layout-sider
<a-layout-sider
:class=
"['sider', device === 'desktop' ? null : 'shadow', theme, fix
edSideMenu
? 'ant-fixed-sidemenu' : null ]"
:class=
"['sider', device === 'desktop' ? null : 'shadow', theme, fix
Siderbar
? 'ant-fixed-sidemenu' : null ]"
width=
"256px"
width=
"256px"
:collapsible=
"collapsible"
:collapsible=
"collapsible"
v-model=
"collapsed"
v-model=
"collapsed"
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
computed
:
{
computed
:
{
...
mapState
({
...
mapState
({
device
:
state
=>
state
.
app
.
device
,
device
:
state
=>
state
.
app
.
device
,
fix
edSideMenu
:
state
=>
state
.
app
.
fixedSideMenu
,
fix
Siderbar
:
state
=>
state
.
app
.
fixSiderbar
,
})
})
},
},
methods
:
{
methods
:
{
...
...
src/components/page/GlobalHeader.vue
View file @
7651ec99
...
@@ -91,12 +91,12 @@
...
@@ -91,12 +91,12 @@
mainMenu
:
state
=>
state
.
permission
.
addRouters
,
mainMenu
:
state
=>
state
.
permission
.
addRouters
,
sidebarOpened
:
state
=>
state
.
app
.
sidebar
.
opened
,
sidebarOpened
:
state
=>
state
.
app
.
sidebar
.
opened
,
fixedHeader
:
state
=>
state
.
app
.
fixedHeader
,
fixedHeader
:
state
=>
state
.
app
.
fixedHeader
,
swipeDownHiddenHeader
:
state
=>
state
.
app
.
swipeDownHidden
Header
,
autoHideHeader
:
state
=>
state
.
app
.
autoHide
Header
,
}),
}),
},
},
methods
:
{
methods
:
{
handleScroll
()
{
handleScroll
()
{
if
(
this
.
swipeDownHidden
Header
)
{
if
(
this
.
autoHide
Header
)
{
let
scrollTop
=
window
.
pageYOffset
||
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
let
scrollTop
=
window
.
pageYOffset
||
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
if
(
scrollTop
>
100
)
{
if
(
scrollTop
>
100
)
{
this
.
headerBarFixed
=
true
this
.
headerBarFixed
=
true
...
...
src/components/page/GlobalLayout.vue
View file @
7651ec99
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
</a-drawer>
</a-drawer>
</
template
>
</
template
>
<a-layout
:class=
"[layoutMode]"
:style=
"{ paddingLeft: fix
edSideMenu
&& device === 'desktop' ? `${sidebarOpened ? 256 : 80}px` : '0' }"
>
<a-layout
:class=
"[layoutMode]"
:style=
"{ paddingLeft: fix
Siderbar
&& device === 'desktop' ? `${sidebarOpened ? 256 : 80}px` : '0' }"
>
<!-- layout header -->
<!-- layout header -->
<global-header
:mode=
"layoutMode"
:theme=
"theme"
:collapsed=
"collapsed"
:device=
"device"
@
toggle=
"toggle"
/>
<global-header
:mode=
"layoutMode"
:theme=
"theme"
:collapsed=
"collapsed"
:device=
"device"
@
toggle=
"toggle"
/>
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
layoutMode
:
state
=>
state
.
app
.
layout
,
layoutMode
:
state
=>
state
.
app
.
layout
,
sidebarOpened
:
state
=>
state
.
app
.
sidebar
.
opened
,
sidebarOpened
:
state
=>
state
.
app
.
sidebar
.
opened
,
fixedHeader
:
state
=>
state
.
app
.
fixedHeader
,
fixedHeader
:
state
=>
state
.
app
.
fixedHeader
,
fix
edSideMenu
:
state
=>
state
.
app
.
fixedSideMenu
,
fix
Siderbar
:
state
=>
state
.
app
.
fixSiderbar
,
theme
:
state
=>
state
.
app
.
theme
,
theme
:
state
=>
state
.
app
.
theme
,
device
:
state
=>
state
.
app
.
device
,
device
:
state
=>
state
.
app
.
device
,
})
})
...
...
src/components/setting/SettingDrawer.vue
View file @
7651ec99
...
@@ -103,13 +103,13 @@
...
@@ -103,13 +103,13 @@
</a-list-item-meta>
</a-list-item-meta>
</a-list-item>
</a-list-item>
<a-list-item>
<a-list-item>
<a-switch
slot=
"actions"
size=
"small"
:defaultChecked=
"
swipeDownHidden
Header"
@
change=
"handleFixedHeaderHidden"
/>
<a-switch
slot=
"actions"
size=
"small"
:defaultChecked=
"
autoHide
Header"
@
change=
"handleFixedHeaderHidden"
/>
<a-list-item-meta>
<a-list-item-meta>
<div
slot=
"title"
>
下滑时隐藏 Header
</div>
<div
slot=
"title"
>
下滑时隐藏 Header
</div>
</a-list-item-meta>
</a-list-item-meta>
</a-list-item>
</a-list-item>
<a-list-item
>
<a-list-item
>
<a-switch
slot=
"actions"
size=
"small"
:disabled=
"(layoutMode === 'topmenu')"
:defaultChecked=
"fix
edSideMenu"
@
change=
"handleFixedSideMenu
"
/>
<a-switch
slot=
"actions"
size=
"small"
:disabled=
"(layoutMode === 'topmenu')"
:defaultChecked=
"fix
Siderbar"
@
change=
"handleFixSiderbar
"
/>
<a-list-item-meta>
<a-list-item-meta>
<div
slot=
"title"
:style=
"{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }"
>
固定侧边菜单
</div>
<div
slot=
"title"
:style=
"{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }"
>
固定侧边菜单
</div>
</a-list-item-meta>
</a-list-item-meta>
...
@@ -175,8 +175,8 @@
...
@@ -175,8 +175,8 @@
primaryColor
:
state
=>
state
.
app
.
color
,
primaryColor
:
state
=>
state
.
app
.
color
,
colorWeak
:
state
=>
state
.
app
.
weak
,
colorWeak
:
state
=>
state
.
app
.
weak
,
fixedHeader
:
state
=>
state
.
app
.
fixedHeader
,
fixedHeader
:
state
=>
state
.
app
.
fixedHeader
,
fix
edSideMenu
:
state
=>
state
.
app
.
fixedSideMenu
,
fix
Siderbar
:
state
=>
state
.
app
.
fixSiderbar
,
swipeDownHiddenHeader
:
state
=>
state
.
app
.
swipeDownHidden
Header
,
autoHideHeader
:
state
=>
state
.
app
.
autoHide
Header
,
})
})
},
},
mounted
()
{
mounted
()
{
...
@@ -215,7 +215,8 @@
...
@@ -215,7 +215,8 @@
handleLayout
(
mode
)
{
handleLayout
(
mode
)
{
this
.
$store
.
dispatch
(
'ToggleLayoutMode'
,
mode
)
this
.
$store
.
dispatch
(
'ToggleLayoutMode'
,
mode
)
// 因为顶部菜单不能固定左侧菜单栏,所以强制关闭
// 因为顶部菜单不能固定左侧菜单栏,所以强制关闭
this
.
handleFixedSideMenu
(
false
);
//
this
.
handleFixSiderbar
(
false
);
},
},
changeColor
(
color
)
{
changeColor
(
color
)
{
if
(
this
.
primaryColor
!==
color
)
{
if
(
this
.
primaryColor
!==
color
)
{
...
@@ -229,12 +230,12 @@
...
@@ -229,12 +230,12 @@
handleFixedHeaderHidden
(
autoHidden
)
{
handleFixedHeaderHidden
(
autoHidden
)
{
this
.
$store
.
dispatch
(
'ToggleFixedHeaderHidden'
,
autoHidden
)
this
.
$store
.
dispatch
(
'ToggleFixedHeaderHidden'
,
autoHidden
)
},
},
handleFix
edSideMenu
(
fixed
)
{
handleFix
Siderbar
(
fixed
)
{
if
(
this
.
layoutMode
===
'topmenu'
)
{
if
(
this
.
layoutMode
===
'topmenu'
)
{
this
.
$store
.
dispatch
(
'ToggleFix
edSidemenu
'
,
false
)
this
.
$store
.
dispatch
(
'ToggleFix
Siderbar
'
,
false
)
return
;
return
;
}
}
this
.
$store
.
dispatch
(
'ToggleFix
edSidemenu
'
,
fixed
)
this
.
$store
.
dispatch
(
'ToggleFix
Siderbar
'
,
fixed
)
}
}
},
},
}
}
...
...
src/main.js
View file @
7651ec99
...
@@ -41,7 +41,7 @@ new Vue({
...
@@ -41,7 +41,7 @@ new Vue({
store
.
commit
(
'TOGGLE_THEME'
,
Vue
.
ls
.
get
(
DEFAULT_THEME
,
config
.
navTheme
))
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_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_HEADER'
,
Vue
.
ls
.
get
(
DEFAULT_FIXED_HEADER
,
config
.
fixedHeader
))
store
.
commit
(
'TOGGLE_FIXED_SIDE
MENU
'
,
Vue
.
ls
.
get
(
DEFAULT_FIXED_SIDEMENU
,
config
.
fixSiderbar
))
store
.
commit
(
'TOGGLE_FIXED_SIDE
RBAR
'
,
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_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_WEAK'
,
Vue
.
ls
.
get
(
DEFAULT_COLOR_WEAK
,
config
.
colorWeak
))
store
.
commit
(
'TOGGLE_COLOR'
,
Vue
.
ls
.
get
(
DEFAULT_COLOR
,
config
.
primaryColor
))
store
.
commit
(
'TOGGLE_COLOR'
,
Vue
.
ls
.
get
(
DEFAULT_COLOR
,
config
.
primaryColor
))
...
...
src/store/modules/app.js
View file @
7651ec99
...
@@ -11,8 +11,8 @@ const app = {
...
@@ -11,8 +11,8 @@ const app = {
theme
:
''
,
theme
:
''
,
layout
:
''
,
layout
:
''
,
fixedHeader
:
false
,
fixedHeader
:
false
,
fix
edSideMenu
:
false
,
fix
Siderbar
:
false
,
swipeDownHidden
Header
:
false
,
autoHide
Header
:
false
,
color
:
null
,
color
:
null
,
weak
:
false
weak
:
false
},
},
...
@@ -42,13 +42,13 @@ const app = {
...
@@ -42,13 +42,13 @@ const app = {
Vue
.
ls
.
set
(
DEFAULT_FIXED_HEADER
,
fixed
)
Vue
.
ls
.
set
(
DEFAULT_FIXED_HEADER
,
fixed
)
state
.
fixedHeader
=
fixed
state
.
fixedHeader
=
fixed
},
},
TOGGLE_FIXED_SIDE
MENU
:
(
state
,
fixed
)
=>
{
TOGGLE_FIXED_SIDE
RBAR
:
(
state
,
fixed
)
=>
{
Vue
.
ls
.
set
(
DEFAULT_FIXED_SIDEMENU
,
fixed
)
Vue
.
ls
.
set
(
DEFAULT_FIXED_SIDEMENU
,
fixed
)
state
.
fix
edSideMenu
=
fixed
state
.
fix
Siderbar
=
fixed
},
},
TOGGLE_FIXED_HEADER_HIDDEN
:
(
state
,
show
)
=>
{
TOGGLE_FIXED_HEADER_HIDDEN
:
(
state
,
show
)
=>
{
Vue
.
ls
.
set
(
DEFAULT_FIXED_HEADER_HIDDEN
,
show
)
Vue
.
ls
.
set
(
DEFAULT_FIXED_HEADER_HIDDEN
,
show
)
state
.
swipeDownHidden
Header
=
show
state
.
autoHide
Header
=
show
},
},
TOGGLE_COLOR
:
(
state
,
color
)
=>
{
TOGGLE_COLOR
:
(
state
,
color
)
=>
{
...
@@ -79,8 +79,8 @@ const app = {
...
@@ -79,8 +79,8 @@ const app = {
ToggleFixedHeader
({
commit
},
fixedHeader
)
{
ToggleFixedHeader
({
commit
},
fixedHeader
)
{
commit
(
'TOGGLE_FIXED_HEADER'
,
fixedHeader
)
commit
(
'TOGGLE_FIXED_HEADER'
,
fixedHeader
)
},
},
ToggleFix
edSidemenu
({
commit
},
fixedSideMenu
)
{
ToggleFix
Siderbar
({
commit
},
fixSiderbar
)
{
commit
(
'TOGGLE_FIXED_SIDE
MENU'
,
fixedSideMenu
)
commit
(
'TOGGLE_FIXED_SIDE
RBAR'
,
fixSiderbar
)
},
},
ToggleFixedHeaderHidden
({
commit
},
show
)
{
ToggleFixedHeaderHidden
({
commit
},
show
)
{
commit
(
'TOGGLE_FIXED_HEADER_HIDDEN'
,
show
)
commit
(
'TOGGLE_FIXED_HEADER_HIDDEN'
,
show
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment