From 8442368be7b7c303bfb45a04bab6fb86848361b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Thu, 29 Aug 2024 18:43:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=20el-tabs=E8=BE=B9=E6=A1=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/form/form-detail/form-page/form-page.scss | 1 + .../form/form-detail/form-tab-panel/form-tab-panel.scss | 1 + src/panel-component/panel-view-header/panel-view-header.scss | 5 +++++ 3 files changed, 7 insertions(+) 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 e7731f93e..05d6d7f68 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 2d04dd657..2a034b94f 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-header/panel-view-header.scss b/src/panel-component/panel-view-header/panel-view-header.scss index 6faffdb51..5a487b290 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; + } } -- Gitee From c95c93c2c033683f9fa4f7d52d4ce544a29131a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Thu, 29 Aug 2024 18:43:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E5=88=86=E9=A1=B5=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E8=A7=86=E5=9B=BE=E5=86=85=E5=AE=B9=E6=97=A0padding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel-view-content/panel-view-content.scss | 4 ++++ src/panel-component/panel-view-content/panel-view-content.tsx | 4 ++++ 2 files changed, 8 insertions(+) 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 b54bf9d9e..9656ea8aa 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 65b9da96e..9758753cb 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, -- Gitee