zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(style): fix layout style, fix #633

This commit is contained in:
vben 2021-05-23 22:46:22 +08:00
parent e3569b81b1
commit 8e3f84c3b7
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/layouts/default/header/MultipleHeader.vue
View File

@ -50,8 +50,7 @@
return unref(getFixed) || unref(getShowFullHeaderRef); return unref(getFixed) || unref(getShowFullHeaderRef);
}); });
const getWrapStyle = computed( const getWrapStyle = computed((): CSSProperties => {
(): CSSProperties => {
const style: CSSProperties = {}; const style: CSSProperties = {};
if (unref(getFixed)) { if (unref(getFixed)) {
style.width = unref(getIsMobile) ? '100%' : unref(getCalcContentWidth); style.width = unref(getIsMobile) ? '100%' : unref(getCalcContentWidth);
@ -60,15 +59,13 @@
style.top = `${HEADER_HEIGHT}px`; style.top = `${HEADER_HEIGHT}px`;
} }
return style; return style;
} });
);
const getIsFixed = computed(() => { const getIsFixed = computed(() => {
return unref(getFixed) || unref(getShowFullHeaderRef); return unref(getFixed) || unref(getShowFullHeaderRef);
}); });
const getPlaceholderDomStyle = computed( const getPlaceholderDomStyle = computed((): CSSProperties => {
(): CSSProperties => {
let height = 0; let height = 0;
if ( if (
(unref(getShowFullHeaderRef) || !unref(getSplit)) && (unref(getShowFullHeaderRef) || !unref(getSplit)) &&
@ -84,8 +81,7 @@
return { return {
height: `${height}px`, height: `${height}px`,
}; };
} });
);
const getClass = computed(() => { const getClass = computed(() => {
return [ return [
@ -116,7 +112,7 @@
flex: 0 0 auto; flex: 0 0 auto;
&--dark { &--dark {
margin-left: 0; margin-left: -1px;
} }
&--fixed { &--fixed {

2
src/layouts/default/header/index.less
View File

@ -166,7 +166,7 @@
&--dark { &--dark {
background-color: @header-dark-bg-color !important; 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; border-left: 1px solid @border-color-base;
.@{header-prefix-cls}-logo { .@{header-prefix-cls}-logo {
&:hover { &:hover {