fix: 修复文本设为左对齐时, 角头文本没有垂直对齐的问题 (#2960)

antvis · Nov 7, 2024 · af8c968 · af8c968
1 parent dd21ab9
commit af8c968
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 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
@@ -7575,8 +7575,8 @@ Array [
     "actualTextWidth": 242,
     "height": 56,
     "multiLineActualTexts": Array [
-      "类别类别类别类别类别类别类",
-      "别类别类别类别",
+      "类别类别类别类别类别类别",
+      "类别类别类别类别",
     ],
     "originalText": "类别类别类别类别类别类别类别类别类别类别",
     "width": 180,

diff --git a/packages/s2-core/__tests__/spreadsheet/corner-spec.ts b/packages/s2-core/__tests__/spreadsheet/corner-spec.ts
@@ -400,4 +400,23 @@ describe('PivotSheet Corner Tests', () => {
 
     expect(cornerCell.getActualText()).toEqual(cornerExtraFieldText);
   });
+
+  test('should keep vertical alignment for tree mode when text align is left', async () => {
+    s2.setOptions({
+      hierarchyType: 'tree',
+    });
+    s2.setTheme({
+      cornerCell: {
+        bolderText: {
+          textAlign: 'left',
+        },
+      },
+    });
+    await s2.render();
+
+    s2.facet.getCornerNodes().forEach((node) => {
+      expect(node.x).toEqual(0);
+      expect(node.width).toEqual(120);
+    });
+  });
 });
diff --git a/packages/s2-core/src/cell/corner-cell.ts b/packages/s2-core/src/cell/corner-cell.ts
@@ -209,7 +209,7 @@ export class CornerCell extends HeaderCell<CornerHeaderConfig> {
   protected getTreeIconWidth() {
     const { size, margin } = this.getStyle()!.icon!;
 
-    return this.showTreeIcon() ? size! + margin!.right! : 0;
+    return this.spreadsheet.isHierarchyTreeType() ? size! + margin!.right! : 0;
   }
 
   public getMaxTextWidth(): number {