fix: 常量抽取

zxc0328 · zxc0328 · commit 4ba8234f3af1 · 2022-04-24T17:14:51.000+08:00
diff --git a/packages/s2-core/src/common/constant/basic.ts b/packages/s2-core/src/common/constant/basic.ts
@@ -44,6 +44,7 @@ export const KEY_GROUP_COL_HORIZONTAL_RESIZE_AREA =
 export const KEY_GROUP_COL_SCROLL = 'colScrollGroup';
 export const KEY_GROUP_COL_FROZEN = 'colFrozenGroup';
 export const KEY_GROUP_COL_FROZEN_TRAILING = 'colFrozenTrailingGroup';
+export const KEY_GROUP_GRID_GROUP = 'gridGroup';
 
 // key of series number node in corner header
 export const KEY_SERIES_NUMBER_NODE = 'series-number-node';
diff --git a/packages/s2-core/src/group/grid-group.ts b/packages/s2-core/src/group/grid-group.ts
@@ -3,6 +3,7 @@ import type { IGroup } from '@antv/g-canvas';
 import { Group } from '@antv/g-canvas';
 import { renderLine } from 'src/utils/g-renders';
 import { GridInfo } from 'src/common/interface';
+import { KEY_GROUP_GRID_GROUP } from 'src/common/constant';
 
 export class GridGroup extends Group {
   private ss: SpreadSheet;
@@ -19,7 +20,7 @@ export class GridGroup extends Group {
     rows: [],
   };
 
-  public updateGrid = (gridInfo: GridInfo, id = 'foobar') => {
+  public updateGrid = (gridInfo: GridInfo, id = KEY_GROUP_GRID_GROUP) => {
     const bbox = this.getBBox();
     const style = this.ss.theme.dataCell.cell;
 
@@ -33,11 +34,12 @@ export class GridGroup extends Group {
 
     this.gridInfo = gridInfo;
     this.gridInfo.cols.forEach((item) => {
+      const x = item - style.verticalBorderWidth / 2;
       renderLine(
         this.gridGroup as Group,
         {
-          x1: item - style.verticalBorderWidth / 2,
-          x2: item - style.verticalBorderWidth / 2,
+          x1: x,
+          x2: x,
           y1: Math.ceil(bbox.minY),
           y2: Math.floor(bbox.maxY),
         },
@@ -50,13 +52,14 @@ export class GridGroup extends Group {
     });
 
     this.gridInfo.rows.forEach((item) => {
+      const y = item - style.horizontalBorderWidth / 2;
       renderLine(
         this.gridGroup as Group,
         {
           x1: Math.ceil(bbox.minX),
           x2: Math.floor(bbox.maxX),
-          y1: item - style.verticalBorderWidth / 2,
-          y2: item - style.verticalBorderWidth / 2,
+          y1: y,
+          y2: y,
         },
         {
           stroke: style.horizontalBorderColor,
