fix: 优化代码

antvis · Nov 19, 2024 · a9ab0b8 · a9ab0b8
1 parent d5ee559
commit a9ab0b8
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 88 deletions.
diff --git a/packages/s2-core/__tests__/unit/cell/__snapshots__/data-cell-spec.ts.snap b/packages/s2-core/__tests__/unit/cell/__snapshots__/data-cell-spec.ts.snap
diff --git a/packages/s2-core/__tests__/unit/interaction/__snapshots__/row-column-resize-spec.ts.snap b/packages/s2-core/__tests__/unit/interaction/__snapshots__/row-column-resize-spec.ts.snap
@@ -133,7 +133,6 @@ Object {
     "test-b": 1,
   },
   "textOverflow": "ellipsis",
-  "widthByField": null,
   "wordWrap": true,
 }
 `;
@@ -149,7 +148,6 @@ Object {
     "testField": 1,
   },
   "textOverflow": "ellipsis",
-  "widthByField": null,
   "wordWrap": true,
 }
 `;

diff --git a/packages/s2-core/src/cell/base-cell.ts b/packages/s2-core/src/cell/base-cell.ts
@@ -189,7 +189,7 @@ export abstract class BaseCell<T extends SimpleBBox> extends Group {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   protected handleRestOptions(...options: unknown[]) {}
 
-  protected getTextDraggedMaxLines(): number | void {}
+  protected getResizedTextMaxLines(): number | void {}
 
   /* -------------------------------------------------------------------------- */
   /*                common functions that will be used in subtype               */
@@ -486,7 +486,7 @@ export abstract class BaseCell<T extends SimpleBBox> extends Group {
     // G 遵循浏览器的规范, 空间不足以展示省略号时, 会裁剪文字, 而不是展示省略号: https://developer.mozilla.org/en-US/docs/Web/CSS/text-overflow#ellipsis
     const maxTextWidth = Math.max(this.getMaxTextWidth(), 0) + EXTRA_PIXEL;
     const textStyle = this.getTextStyle();
-    const maxLines = this.getTextDraggedMaxLines() || textStyle?.maxLines;
+    const maxLines = this.getResizedTextMaxLines() || textStyle?.maxLines;
 
     // 在坐标计算 (getTextPosition) 之前, 预渲染一次, 提前生成 textShape, 获得文字宽度, 用于计算 icon 绘制坐标
     this.renderTextShape({

diff --git a/packages/s2-core/src/cell/col-cell.ts b/packages/s2-core/src/cell/col-cell.ts
@@ -583,7 +583,7 @@ export class ColCell extends HeaderCell<ColHeaderConfig> {
     return isNextSiblingNodeHidden && isPrevSiblingNodeHidden;
   }
 
-  protected getTextDraggedMaxLines() {
+  protected getResizedTextMaxLines() {
     const { colCell } = this.spreadsheet.options.style!;
 
     return (

diff --git a/packages/s2-core/src/cell/corner-cell.ts b/packages/s2-core/src/cell/corner-cell.ts
@@ -273,7 +273,7 @@ export class CornerCell extends HeaderCell<CornerHeaderConfig> {
     );
   }
 
-  protected getTextDraggedMaxLines() {
+  protected getResizedTextMaxLines() {
     // 角头和列头高度一致
     const { colCell } = this.spreadsheet.options.style!;
 

diff --git a/packages/s2-core/src/cell/data-cell.ts b/packages/s2-core/src/cell/data-cell.ts
@@ -509,7 +509,7 @@ export class DataCell extends BaseCell<ViewMeta> {
     updateShapeAttr(this.conditionIconShapes, SHAPE_STYLE_MAP.opacity, opacity);
   }
 
-  protected getTextDraggedMaxLines() {
+  protected getResizedTextMaxLines() {
     const { rowCell } = this.spreadsheet.options.style!;
 
     // 数值和行高保持一致, 同时兼容明细表

diff --git a/packages/s2-core/src/cell/row-cell.ts b/packages/s2-core/src/cell/row-cell.ts
@@ -492,7 +492,7 @@ export class RowCell extends HeaderCell<RowHeaderConfig> {
     return { x: textX, y: textStart };
   }
 
-  protected getTextDraggedMaxLines() {
+  protected getResizedTextMaxLines() {
     const { rowCell } = this.spreadsheet.options.style!;
 
     return (

diff --git a/packages/s2-core/src/common/interface/resize.ts b/packages/s2-core/src/common/interface/resize.ts
@@ -64,7 +64,7 @@ export interface ResizeInfo {
   isResizeArea?: boolean;
   isResizeMask?: boolean;
 
-  /** 当前拖拽热区对应的节点信息 */
+  /** 当前拖拽热区对应的单元格/节点信息 */
   meta: Node | ViewMeta;
   cell: S2CellType;
 

diff --git a/packages/s2-core/src/interaction/row-column-resize.ts b/packages/s2-core/src/interaction/row-column-resize.ts
@@ -7,6 +7,7 @@ import {
 } from '@antv/g';
 import { clone, isEmpty, throttle } from 'lodash';
 import type {
+  CellTextWordWrapStyle,
   DefaultCellTheme,
   ResizeInteractionOptions,
   ResizeParams,
@@ -254,23 +255,6 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
     const displayWidth = isDisabled ? originalWidth : resizedWidth;
     const displayHeight = isDisabled ? originalHeight : resizedHeight;
 
-    // // 高度调整时, 根据行高计算最大可展示的文本行数, 覆盖原本的 maxLines 配置
-    // if (resizeInfo.type === ResizeDirectionType.Vertical) {
-    //   const { cell } = resizeInfo?.cell?.getStyle() as DefaultCellTheme;
-    //   const padding = cell!.padding!.top! + cell!.padding!.bottom!;
-    //   const lineHeight = resizeInfo?.cell?.getTextLineHeight()!;
-    //   const maxLines = !isDisabled
-    //     ? Math.max(1, Math.floor((displayHeight - padding) / lineHeight))
-    //     : undefined;
-
-    //   return {
-    //     displayWidth,
-    //     displayHeight,
-    //     isDisabled,
-    //     maxLines,
-    //   };
-    // }
-
     return {
       displayWidth,
       displayHeight,
@@ -397,6 +381,7 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
   }
 
   private getResizeHeightDetail(): ResizeDetail | null {
+    const { style } = this.spreadsheet.options;
     const resizeInfo = this.getResizeInfo();
     const { displayHeight } = this.getDisAllowResizeInfo();
 
@@ -405,8 +390,9 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
         return {
           eventType: S2Event.LAYOUT_RESIZE_COL_HEIGHT,
           style: {
-            colCell: this.transform(
+            colCell: this.getResizedCellStyleByField(
               this.getColCellHeightByField(resizeInfo, displayHeight!),
+              style?.colCell!,
               displayHeight,
             ),
           },
@@ -417,8 +403,9 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
           eventType: S2Event.LAYOUT_RESIZE_ROW_HEIGHT,
           style: {
             rowCell: {
-              ...this.transform(
+              ...this.getResizedCellStyleByField(
                 this.getCellStyleByField(displayHeight),
+                style?.rowCell!,
                 displayHeight,
               ),
               height: !this.isEffectRowOf(ResizeType.ALL)
@@ -433,13 +420,24 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
     }
   }
 
-  private transform(
+  private getResizedCellStyleByField(
     heightByField: Record<string, number>,
+    cellStyle: CellTextWordWrapStyle,
     displayHeight: number,
   ) {
+    const isEnableHeightAdaptive =
+      cellStyle?.maxLines! > 1 && cellStyle?.wordWrap;
+
+    if (isEnableHeightAdaptive) {
+      return {
+        heightByField,
+      };
+    }
+
+    // 如果开启了换行, 高度拖拽后动态计算 maxLines 的值, 已保证展示合理性.
     const { cell } = this.getResizeInfo();
-    const { cell: cellStyle } = cell?.getStyle() as DefaultCellTheme;
-    const padding = cellStyle!.padding!.top! + cellStyle!.padding!.bottom!;
+    const { cell: cellTheme } = cell?.getStyle() as DefaultCellTheme;
+    const padding = cellTheme!.padding!.top! + cellTheme!.padding!.bottom!;
     const lineHeight = cell?.getTextLineHeight()!;
 
     const maxLines = Math.max(