From 93d88e0b4d02b6e269ae7f06eb4fa0d719d146a5 Mon Sep 17 00:00:00 2001 From: lijinke666 Date: Tue, 14 Jan 2025 14:48:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=8D=A0=E4=BD=8D=E7=AC=A6?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E7=A9=BF=E9=80=8F=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20close=20#3077?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/src/facet/table-facet.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/s2-core/src/facet/table-facet.ts b/packages/s2-core/src/facet/table-facet.ts index dc80e2ce5a..9ff323b1b0 100644 --- a/packages/s2-core/src/facet/table-facet.ts +++ b/packages/s2-core/src/facet/table-facet.ts @@ -124,6 +124,7 @@ export class TableFacet extends FrozenFacet { } const { empty } = this.spreadsheet.options.placeholder!; + const { background } = this.spreadsheet.theme; const { icon, description } = this.spreadsheet.theme.empty; const { horizontalBorderWidth, @@ -148,6 +149,7 @@ export class TableFacet extends FrozenFacet { stroke: horizontalBorderColor, strokeWidth: horizontalBorderWidth, strokeOpacity: horizontalBorderColorOpacity, + fill: background?.color, }, }); @@ -173,6 +175,8 @@ export class TableFacet extends FrozenFacet { y: descY, }, }); + + this.emptyPlaceholderGroup.toFront(); } private getDataCellAdaptiveHeight(viewMeta: ViewMeta): number { From 6b5326f34c849a5560223e80e94cb761edbd296c Mon Sep 17 00:00:00 2001 From: lijinke666 Date: Fri, 17 Jan 2025 10:24:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/src/facet/table-facet.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s2-core/src/facet/table-facet.ts b/packages/s2-core/src/facet/table-facet.ts index 9ff323b1b0..c26585d1a0 100644 --- a/packages/s2-core/src/facet/table-facet.ts +++ b/packages/s2-core/src/facet/table-facet.ts @@ -150,6 +150,7 @@ export class TableFacet extends FrozenFacet { strokeWidth: horizontalBorderWidth, strokeOpacity: horizontalBorderColorOpacity, fill: background?.color, + fillOpacity: background?.opacity ?? 1, }, });