diff --git a/src/control/form/form-detail/form-page/form-page.scss b/src/control/form/form-detail/form-page/form-page.scss index e7731f93e732b929340238bbe33990922dd01dfc..05d6d7f687fab98867681ab091087f4f2446768a 100644 --- a/src/control/form/form-detail/form-page/form-page.scss +++ b/src/control/form/form-detail/form-page/form-page.scss @@ -71,6 +71,7 @@ $form-page: ( // 分页头部底边 .el-tabs__nav-wrap::after { + height: 1px; background-color: getCssVar('form-page', 'header-border-color'); } diff --git a/src/control/form/form-detail/form-tab-panel/form-tab-panel.scss b/src/control/form/form-detail/form-tab-panel/form-tab-panel.scss index 2d04dd6576854491a64c53179bf7952a39960513..2a034b94f069dae2d6dd5fa4dd317dd8cfcc01e6 100644 --- a/src/control/form/form-detail/form-tab-panel/form-tab-panel.scss +++ b/src/control/form/form-detail/form-tab-panel/form-tab-panel.scss @@ -37,6 +37,7 @@ $form-tab-panel: ( // 分页头部底边 .el-tabs__nav-wrap::after { + height: 1px; background-color: getCssVar('form-tab-panel', 'header-border-color'); } diff --git a/src/panel-component/panel-view-content/panel-view-content.scss b/src/panel-component/panel-view-content/panel-view-content.scss index b54bf9d9ef60e9fe35ae13fc9ab7e227460990bc..9656ea8aa2d65df838a84a1c97c1d6edcd4b1fdd 100644 --- a/src/panel-component/panel-view-content/panel-view-content.scss +++ b/src/panel-component/panel-view-content/panel-view-content.scss @@ -14,4 +14,8 @@ $panel-view-content: ( >.#{bem(row)} { height: 100%; } + + @include m(no-padding) { + padding: getCssVar('spacing', 'none'); + } } diff --git a/src/panel-component/panel-view-content/panel-view-content.tsx b/src/panel-component/panel-view-content/panel-view-content.tsx index 65b9da96ed67b7b6eb794c598f476800f9a09c0e..9758753cb78925bef94dcbf6eef30a350b9c29cb 100644 --- a/src/panel-component/panel-view-content/panel-view-content.tsx +++ b/src/panel-component/panel-view-content/panel-view-content.tsx @@ -30,6 +30,10 @@ export const PanelViewContent = defineComponent({ // 类名控制 const classArr = computed(() => { let result: Array = [ns.b(), ns.m(id)]; + const { view } = props.controller.panel; + if (view.model.viewType === 'DETABEXPVIEW') { + result.push(ns.m('no-padding')); + } if (showCaption === true) { result = [ ...result, diff --git a/src/panel-component/panel-view-header/panel-view-header.scss b/src/panel-component/panel-view-header/panel-view-header.scss index 6faffdb519b66905c2691747ffd2d34f2c97463e..5a487b2909fb6abad4be3710a76763f9b8d4a0ea 100644 --- a/src/panel-component/panel-view-header/panel-view-header.scss +++ b/src/panel-component/panel-view-header/panel-view-header.scss @@ -10,4 +10,9 @@ .#{bem(panel-container, '', view_header_right)} { padding: 0 getCssVar('spacing', 'base'); } + + // 视图头存在边框,分页栏边框隐藏 + .el-tabs__nav-wrap::after { + display: none; + } }