提交 236773c5 编写于 作者: 朱政权's avatar 朱政权

style: 修复导航视图未对齐

上级 b55cb111
@include b(layout-content) {
overflow: hidden;
}
\ No newline at end of file
...@@ -4,6 +4,7 @@ import { useNamespace } from '@ibiz-template/vue-util'; ...@@ -4,6 +4,7 @@ import { useNamespace } from '@ibiz-template/vue-util';
import { Namespace } from '@ibiz-template/core'; import { Namespace } from '@ibiz-template/core';
import '@ibiz-template/theme/style/components/layout/app-layout/app-layout.scss'; import '@ibiz-template/theme/style/components/layout/app-layout/app-layout.scss';
import { renderCompatibleIE } from '@/ie-util'; import { renderCompatibleIE } from '@/ie-util';
import './app-layout.scss';
function renderLogo(ns: Namespace, model: IndexViewModel) { function renderLogo(ns: Namespace, model: IndexViewModel) {
return ( return (
......
...@@ -7,6 +7,14 @@ ...@@ -7,6 +7,14 @@
} }
@include b(exp-view-left) { @include b(exp-view-left) {
width: getCssVar('exp-view', 'left-width'); width: getCssVar('exp-view', 'left-width');
// 左侧导航栏无上下margin
.#{bem(view-layout-content)} {
margin-top: 0;
margin-bottom: 0;
padding-top: 0;
padding-bottom: 0;
}
} }
@include b(exp-view-right) { @include b(exp-view-right) {
...@@ -19,6 +27,11 @@ ...@@ -19,6 +27,11 @@
@include flex(row, space-between, center); @include flex(row, space-between, center);
padding: 16px; padding: 16px;
line-height: 32px;
min-height: 65px;
font-size: getCssVar(view-layout, route-caption-font-size);
font-weight: getCssVar(view-layout, route-caption-font-weight);
color: getCssVar(view-layout, route-caption-color);
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
@include b(exp-view-exp-bar-header-right) { @include b(exp-view-exp-bar-header-right) {
...@@ -31,11 +44,12 @@ ...@@ -31,11 +44,12 @@
@include when(no-header) { @include when(no-header) {
@include b(exp-view-exp-bar-header) { @include b(exp-view-exp-bar-header) {
padding: 0; display: none;
border: none;
} }
@include b(exp-view-exp-bar-content) { @include b(exp-view-exp-bar-content) {
height: 100%; height: 100%;
padding-top: getCssVar(view-layout, route-content-padding);
padding-bottom: getCssVar(view-layout, route-content-padding);
} }
} }
} }
...@@ -34,7 +34,7 @@ export const ExpViewBase = defineComponent({ ...@@ -34,7 +34,7 @@ export const ExpViewBase = defineComponent({
// 是否显示头部 // 是否显示头部
const isShowHeader = computed(() => { const isShowHeader = computed(() => {
return ( return (
props.expBarModel?.showTitleBar || (props.expBarModel?.showTitleBar && props.expBarModel?.title) ||
props.expBarModel?.enableSearch || props.expBarModel?.enableSearch ||
props.controller.model.toolbar props.controller.model.toolbar
); );
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册