From aab23f6e4cf6d229c27c7a2f1b844a503ed07141 Mon Sep 17 00:00:00 2001 From: wisonic Date: Mon, 14 Oct 2024 16:00:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E8=A1=A8=E5=A4=B4=E8=83=8C=E6=99=AF=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=93=E5=BC=80=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E5=B7=A6=E4=BE=A7=E6=98=BE=E7=A4=BA=E7=99=BD?= =?UTF-8?q?=E7=BA=BF=20#12242?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/js/panel/common/common_table.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts index a13fecd54e..92533be380 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts @@ -276,7 +276,7 @@ export function getCustomTheme(chart: Chart): S2Theme { } merge(theme, tmpTheme) } - if (tableHeader.showVerticalBorder === false) { + if (tableHeader.showVerticalBorder === false && tableHeader.showTableHeader !== false) { const tmpTheme: S2Theme = { splitLine: { verticalBorderColor: tableHeaderBgColor, @@ -287,6 +287,12 @@ export function getCustomTheme(chart: Chart): S2Theme { verticalBorderColor: tableHeaderBgColor, verticalBorderWidth: 0 } + }, + cornerCell: { + cell: { + verticalBorderColor: tableHeaderBgColor, + verticalBorderWidth: 0 + } } } merge(theme, tmpTheme) From ba34460fda4c5996f11ca3d19a2428fdf252529c Mon Sep 17 00:00:00 2001 From: wisonic Date: Mon, 14 Oct 2024 16:02:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E8=A1=A8=E5=A4=B4=E5=92=8C=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E4=B8=80=E6=A0=B7=E6=97=B6?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2=E6=B7=B1=E6=B5=85=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=20#12663?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/js/panel/common/common_table.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts index 92533be380..32bf06f53f 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts @@ -52,7 +52,8 @@ export function getCustomTheme(chart: Chart): S2Theme { }, splitLine: { horizontalBorderColor: borderColor, - verticalBorderColor: borderColor + verticalBorderColor: borderColor, + horizontalBorderWidth: 0 }, cornerCell: { cell: {