From 2c40b87ed407e962ecdeaf48885a1caaa4a6b8ad Mon Sep 17 00:00:00 2001 From: lijinke666 Date: Tue, 5 Dec 2023 17:15:06 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unit/utils/interaction/state-controller-spec.ts | 4 ++-- packages/s2-core/src/common/interface/emitter.ts | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/s2-core/__tests__/unit/utils/interaction/state-controller-spec.ts b/packages/s2-core/__tests__/unit/utils/interaction/state-controller-spec.ts index f9aae9923d..a1610f0a9a 100644 --- a/packages/s2-core/__tests__/unit/utils/interaction/state-controller-spec.ts +++ b/packages/s2-core/__tests__/unit/utils/interaction/state-controller-spec.ts @@ -1,5 +1,5 @@ +import type { RowCell } from '../../../../src/cell'; import { getCellMeta } from '@/utils/interaction/select-event'; -import type { BaseRowCell } from '@/cell/base-row-cell'; import { CellTypes, InteractionStateName } from '@/common/constant/interaction'; import type { S2Options } from '@/common/interface'; import { Store } from '@/common/store'; @@ -25,7 +25,7 @@ describe('State Controller Utils Tests', () => { id: `root[&]price`, }; }, - } as unknown as BaseRowCell; + } as unknown as RowCell; let mockInstance: SpreadSheet; diff --git a/packages/s2-core/src/common/interface/emitter.ts b/packages/s2-core/src/common/interface/emitter.ts index 74b400f36b..800f878f95 100644 --- a/packages/s2-core/src/common/interface/emitter.ts +++ b/packages/s2-core/src/common/interface/emitter.ts @@ -1,7 +1,5 @@ import type { Event as CanvasEvent } from '@antv/g-canvas'; -import type { ColCell } from '../../cell/col-cell'; -import type { DataCell } from '../../cell/data-cell'; -import type { BaseRowCell } from '../../cell/base-row-cell'; +import type { ColCell, DataCell, RowCell } from '../../cell'; import type { S2Event } from '../../common/constant'; import type { CellMeta, @@ -106,7 +104,7 @@ export interface EmitterType { data: RowCellCollapseTreeRowsType, ) => void; [S2Event.ROW_CELL_SCROLL]: (position: CellScrollPosition) => void; - [S2Event.ROW_CELL_BRUSH_SELECTION]: (cells: BaseRowCell[]) => void; + [S2Event.ROW_CELL_BRUSH_SELECTION]: (cells: RowCell[]) => void; /** ================ Col Cell ================ */ [S2Event.COL_CELL_MOUSE_DOWN]: CanvasEventHandler;