Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
najiu-frontend
najiu-admin-template
Commits
8e3f84c3
Commit
8e3f84c3
authored
May 23, 2021
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(style): fix layout style, fix #633
parent
e3569b81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
31 deletions
+27
-31
MultipleHeader.vue
src/layouts/default/header/MultipleHeader.vue
+26
-30
index.less
src/layouts/default/header/index.less
+1
-1
No files found.
src/layouts/default/header/MultipleHeader.vue
View file @
8e3f84c3
...
...
@@ -50,42 +50,38 @@
return
unref
(
getFixed
)
||
unref
(
getShowFullHeaderRef
);
});
const
getWrapStyle
=
computed
(
():
CSSProperties
=>
{
const
style
:
CSSProperties
=
{};
if
(
unref
(
getFixed
))
{
style
.
width
=
unref
(
getIsMobile
)
?
'
100%
'
:
unref
(
getCalcContentWidth
);
}
if
(
unref
(
getShowFullHeaderRef
))
{
style
.
top
=
`
${
HEADER_HEIGHT
}
px`
;
}
return
style
;
const
getWrapStyle
=
computed
(():
CSSProperties
=>
{
const
style
:
CSSProperties
=
{};
if
(
unref
(
getFixed
))
{
style
.
width
=
unref
(
getIsMobile
)
?
'
100%
'
:
unref
(
getCalcContentWidth
);
}
);
if
(
unref
(
getShowFullHeaderRef
))
{
style
.
top
=
`
${
HEADER_HEIGHT
}
px`
;
}
return
style
;
});
const
getIsFixed
=
computed
(()
=>
{
return
unref
(
getFixed
)
||
unref
(
getShowFullHeaderRef
);
});
const
getPlaceholderDomStyle
=
computed
(
():
CSSProperties
=>
{
let
height
=
0
;
if
(
(
unref
(
getShowFullHeaderRef
)
||
!
unref
(
getSplit
))
&&
unref
(
getShowHeader
)
&&
!
unref
(
getFullContent
)
)
{
height
+=
HEADER_HEIGHT
;
}
if
(
unref
(
getShowMultipleTab
)
&&
!
unref
(
getFullContent
))
{
height
+=
TABS_HEIGHT
;
}
headerHeightRef
.
value
=
height
;
return
{
height
:
`
${
height
}
px`
,
};
const
getPlaceholderDomStyle
=
computed
(():
CSSProperties
=>
{
let
height
=
0
;
if
(
(
unref
(
getShowFullHeaderRef
)
||
!
unref
(
getSplit
))
&&
unref
(
getShowHeader
)
&&
!
unref
(
getFullContent
)
)
{
height
+=
HEADER_HEIGHT
;
}
);
if
(
unref
(
getShowMultipleTab
)
&&
!
unref
(
getFullContent
))
{
height
+=
TABS_HEIGHT
;
}
headerHeightRef
.
value
=
height
;
return
{
height
:
`
${
height
}
px`
,
};
});
const
getClass
=
computed
(()
=>
{
return
[
...
...
@@ -116,7 +112,7 @@
flex: 0 0 auto;
&--dark {
margin-left:
0
;
margin-left:
-1px
;
}
&--fixed {
...
...
src/layouts/default/header/index.less
View file @
8e3f84c3
...
...
@@ -166,7 +166,7 @@
&--dark {
background-color: @header-dark-bg-color !important;
border-bottom: 1px solid @border-color-base;
//
border-bottom: 1px solid @border-color-base;
border-left: 1px solid @border-color-base;
.@{header-prefix-cls}-logo {
&:hover {
...
...
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