From 26fd50432d1b265d51188a986efee5cac7477fa3 Mon Sep 17 00:00:00 2001 From: wisonic-s <51065359+wisonic-s@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:23:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=80=8F=E8=A7=86=E8=A1=A8=E5=92=8C=E6=B1=87=E6=80=BB=E8=A1=A8?= =?UTF-8?q?=E6=96=91=E9=A9=AC=E7=BA=B9=E5=A4=B1=E6=95=88=20(#15268)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/js/panel/charts/table/table-info.ts | 5 +++++ .../views/chart/components/js/panel/common/common_table.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts index b38ad8a6cc..a05587d336 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts @@ -444,6 +444,11 @@ export class TableInfo extends S2ChartView { const fontStyle = tableCell.isItalic ? 'italic' : 'normal' const fontWeight = tableCell.isBolder === false ? 'normal' : 'bold' const mergeCellTheme: S2Theme = { + dataCell: { + cell: { + crossBackgroundColor: tableItemBgColor + } + }, mergedCell: { cell: { backgroundColor: tableItemBgColor, 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 1939633776..ef0b7b5264 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 @@ -401,7 +401,7 @@ export function getCustomTheme(chart: Chart): S2Theme { }, dataCell: { cell: { - crossBackgroundColor: enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor, + crossBackgroundColor: enableTableCrossBG ? tableItemSubBgColor : tableItemBgColor, backgroundColor: tableItemBgColor }, bolderText: {