test: 单测修复, row 带序号时 clip 修复

antvis · Jan 15, 2024 · 478dcb2 · 478dcb2
1 parent a620074
commit 478dcb2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap
@@ -2428,12 +2428,12 @@ Array [
     "width": 96,
   },
   Object {
-    "actualText": "城我是省略号",
+    "actualText": "城市城@@@",
     "actualTextHeight": 16,
-    "actualTextWidth": 73,
+    "actualTextWidth": 72,
     "height": 30,
     "multiLineActualTexts": Array [
-      "城我是省略号",
+      "城市城@@@",
     ],
     "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
     "width": 96,

diff --git a/packages/s2-core/src/facet/header/row.ts b/packages/s2-core/src/facet/header/row.ts
@@ -140,7 +140,7 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
 
     this.scrollGroup.style.clipPath = new Rect({
       style: {
-        x: position.x,
+        x: spreadsheet.facet.cornerBBox.x,
         y: position.y + frozenRowGroupHeight,
         width,
         height: viewportHeight,
@@ -149,7 +149,7 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
 
     this.frozenRowGroup.style.clipPath = new Rect({
       style: {
-        x: position.x,
+        x: spreadsheet.facet.cornerBBox.x,
         y: position.y,
         width,
         height: frozenRowGroupHeight,

diff --git a/packages/s2-core/src/facet/header/series-number.ts b/packages/s2-core/src/facet/header/series-number.ts
@@ -65,12 +65,13 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
   }
 
   public clip(): void {
-    const { width, height, viewportHeight } = this.getHeaderConfig();
+    const { width, height, viewportHeight, position, spreadsheet } =
+      this.getHeaderConfig();
 
     this.style.clipPath = new Rect({
       style: {
-        x: 0,
-        y: 0,
+        x: spreadsheet.facet.cornerBBox.x,
+        y: position.y,
         width,
         height: height + viewportHeight,
       },