fix: fix series resize area (#858)

* fix: fix series resize * refactor: refine code style * feat: remove resize limit
antvis · Dec 3, 2021 · 76407db · 76407db
1 parent 9386688
commit 76407db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 29 deletions.
diff --git a/packages/s2-core/src/cell/corner-cell.ts b/packages/s2-core/src/cell/corner-cell.ts
@@ -1,6 +1,6 @@
 import { IShape, Point, ShapeAttrs } from '@antv/g-canvas';
 import { isEmpty, isEqual, last, max } from 'lodash';
-import { KEY_SERIES_NUMBER_NODE } from './../common/constant/basic';
+import { TextAlign } from './../common/interface/theme';
 import { shouldAddResizeArea } from './../utils/interaction/resize';
 import { HeaderCell } from './header-cell';
 import {
@@ -143,7 +143,7 @@ export class CornerCell extends HeaderCell {
    * 绘制折叠展开的icon
    */
   private drawTreeIcon() {
-    if (!this.showTreeIcon() || this.meta.cornerType !== CornerNodeType.ROW) {
+    if (!this.showTreeIcon() || this.meta.cornerType === CornerNodeType.Col) {
       return;
     }
     const { hierarchyCollapse } = this.headerConfig;
@@ -233,15 +233,15 @@ export class CornerCell extends HeaderCell {
     const { cornerType, field } = this.meta;
     const { rows } = this.headerConfig;
     return (
-      cornerType === CornerNodeType.ROW &&
+      cornerType === CornerNodeType.Row &&
       (this.spreadsheet.isHierarchyTreeType() || last(rows) === field)
     );
   }
 
   private getResizeAreaEffect() {
-    const { key } = this.meta;
+    const { cornerType } = this.meta;
 
-    if (key === KEY_SERIES_NUMBER_NODE) {
+    if (cornerType === CornerNodeType.Series) {
       return ResizeAreaEffect.Series;
     }
 
@@ -349,8 +349,8 @@ export class CornerCell extends HeaderCell {
     const cornerTextStyle = this.getStyle().bolderText;
     const { cornerType } = this.meta;
 
-    const textAlign =
-      cornerType === CornerNodeType.ROW ? cornerTextStyle.textAlign : 'right';
+    const textAlign: TextAlign =
+      cornerType === CornerNodeType.Col ? 'right' : cornerTextStyle.textAlign;
 
     return {
       ...cornerTextStyle,

diff --git a/packages/s2-core/src/common/interface/node.ts b/packages/s2-core/src/common/interface/node.ts
@@ -1,5 +1,6 @@
 // 角头 node 类型
 export enum CornerNodeType {
-  ROW = 'row',
+  Row = 'row',
   Col = 'col',
+  Series = 'series',
 }
diff --git a/packages/s2-core/src/facet/header/corner.ts b/packages/s2-core/src/facet/header/corner.ts
@@ -119,7 +119,7 @@ export class CornerHeader extends BaseHeader<CornerHeaderConfig> {
       // different type different height
       sNode.height = colsHierarchy?.sampleNodeForLastLevel?.height;
       sNode.isPivotMode = true;
-      sNode.cornerType = CornerNodeType.ROW;
+      sNode.cornerType = CornerNodeType.Series;
       cornerNodes.push(sNode);
     }
 
@@ -146,7 +146,7 @@ export class CornerHeader extends BaseHeader<CornerHeaderConfig> {
         cNode.seriesNumberWidth = seriesNumberWidth;
         cNode.isPivotMode = true;
         cNode.spreadsheet = s2;
-        cNode.cornerType = CornerNodeType.ROW;
+        cNode.cornerType = CornerNodeType.Row;
         cornerNodes.push(cNode);
       } else {
         // spreadsheet type grid mode
@@ -164,7 +164,7 @@ export class CornerHeader extends BaseHeader<CornerHeaderConfig> {
           cNode.height = colsHierarchy.sampleNodeForLastLevel.height;
           cNode.field = field;
           cNode.isPivotMode = true;
-          cNode.cornerType = CornerNodeType.ROW;
+          cNode.cornerType = CornerNodeType.Row;
           cNode.spreadsheet = s2;
           cornerNodes.push(cNode);
         });

diff --git a/packages/s2-core/src/interaction/row-column-resize.ts b/packages/s2-core/src/interaction/row-column-resize.ts
@@ -302,20 +302,6 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
     });
   }
 
-  private isResizeMoreThanMaxCornerWidthLimit(offsetX: number) {
-    const resizeInfo = this.getResizeInfo();
-
-    const isResizeFreezeRowHeader =
-      resizeInfo.effect !== ResizeAreaEffect.Cell &&
-      this.spreadsheet.isFrozenRowHeader();
-
-    const { width: canvasWidth } = this.spreadsheet.options;
-    const maxCornerWidth = Math.floor(canvasWidth * CORNER_MAX_WIDTH_RATIO);
-    const isMoreThanMaxRowHeaderWidthLimit = offsetX >= maxCornerWidth;
-
-    return isResizeFreezeRowHeader && isMoreThanMaxRowHeaderWidthLimit;
-  }
-
   private resizeMouseMove = (event: CanvasEvent) => {
     if (!this.resizeReferenceGroup?.get('visible')) {
       return;
@@ -359,10 +345,6 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement {
     guideLineStart: ResizeGuideLinePath,
     guideLineEnd: ResizeGuideLinePath,
   ) {
-    if (this.isResizeMoreThanMaxCornerWidthLimit(originalEvent.offsetX)) {
-      return;
-    }
-
     let offsetX = originalEvent.offsetX - this.resizeStartPosition.offsetX;
     if (resizeInfo.width + offsetX < MIN_CELL_WIDTH) {
       // 禁止拖到最小宽度