fix: 多行文本二次渲染后少一行 (#3089)

* fix: render maxLines text correctly after render twice * test: 单元测试统一位置 --------- Co-authored-by: huiyu.zjt <huiyu.zjt@antgroup.com>
antvis · Feb 6, 2025 · f31e616 · f31e616
1 parent e425cbc
commit f31e616
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts b/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts
@@ -1366,5 +1366,57 @@ describe('SpreadSheet Multi Line Text Tests', () => {
 
       matchCellStyleSnapshot();
     });
+
+    // https://github.com/antvis/S2/issues/3087
+    test('should render maxLines text correctly after render twice', async () => {
+      const data = Array(100).fill({
+        province: 'S2'.repeat(100),
+        city: 'antv',
+      });
+
+      const tableSheet = new TableSheet(
+        getContainer(),
+        {
+          fields: {
+            columns: ['province', 'city'],
+          },
+          meta: [
+            {
+              field: 'province',
+              name: '省份',
+            },
+            {
+              field: 'city',
+              name: '城市',
+            },
+          ],
+          data,
+        },
+        {
+          width: 600,
+          height: 480,
+          style: {
+            colCell: {
+              maxLines: 3,
+              wordWrap: true,
+              textOverflow: 'ellipsis',
+            },
+            dataCell: {
+              maxLines: 3,
+              wordWrap: true,
+              textOverflow: 'ellipsis',
+            },
+          },
+        },
+      );
+
+      await tableSheet.render();
+      const actualText1 = tableSheet.facet.getDataCells()[0].getActualText();
+
+      await tableSheet.render();
+      const actualText2 = tableSheet.facet.getDataCells()[0].getActualText();
+
+      expect(actualText1).toEqual(actualText2);
+    });
   });
 });
diff --git a/packages/s2-core/src/cell/base-cell.ts b/packages/s2-core/src/cell/base-cell.ts
@@ -856,7 +856,7 @@ export abstract class BaseCell<T extends SimpleBBox> extends Group {
 
     const maxLines = Math.max(
       1,
-      Math.floor((displayHeight - padding) / lineHeight),
+      Math.round((displayHeight - padding) / lineHeight),
     );
 
     return maxLines;