fix(table-sheet): 修复明细表排序后开启行列冻结, 冻结行展示错误 close #2388

packages/s2-core/__tests__/spreadsheet/theme-spec.ts

@@ -1,5 +1,5 @@
 /* eslint-disable jest/expect-expect */
-import { createPivotSheet } from 'tests/util/helpers';
+import { createPivotSheet, createTableSheet } from 'tests/util/helpers';
 import type { Group, IGroup, ShapeAttrs } from '@antv/g-canvas';
 import { get } from 'lodash';
 import type {
@@ -52,10 +52,16 @@ describe('SpreadSheet Theme Tests', () => {
  CellTypes.MERGED_CELL,
  ];
 
- test('should get default theme', () => {
+ test('should get pivot sheet default theme', () => {
  expect(s2.theme).toMatchSnapshot();
  });
 
+ test('should get table sheet theme', () => {
+ const tableSheet = createTableSheet(null);
+
+ expect(tableSheet.theme).toMatchSnapshot();
+ });
+
  test.each(CELL_TYPES)(
  "should assign the same color for %s's text and icon",
  (cellType: CellTypes) => {

packages/s2-core/__tests__/unit/data-set/table-data-set-spec.ts

@@ -3,15 +3,17 @@
  */
 import { assembleDataCfg } from 'tests/util';
 import type { S2DataConfig } from '@/common/interface';
-import { TableSheet } from '@/sheet-type';
+import { SpreadSheet, TableSheet } from '@/sheet-type';
 import { TableDataSet } from '@/data-set/table-data-set';
 
 jest.mock('@/sheet-type');
 jest.mock('@/facet/layout/node');
 const MockTableSheet = TableSheet as any as jest.Mock<TableSheet>;
 
 describe('Table Mode Dataset Test', () => {
+ let s2: SpreadSheet;
  let dataSet: TableDataSet;
+
  const mockNumberFormatter = jest.fn().mockReturnValue('number');
  const mockSubTypeFormatter = jest.fn().mockReturnValue('sub_type');
  const mockTypeFormatter = jest.fn().mockReturnValue('type');
@@ -56,9 +58,12 @@ describe('Table Mode Dataset Test', () => {
  },
  ],
  };
+
  beforeEach(() => {
  MockTableSheet.mockClear();
- dataSet = new TableDataSet(new MockTableSheet());
+
+ s2 = new MockTableSheet();
+ dataSet = new TableDataSet(s2);
 
  dataSet.setDataCfg(dataCfg);
  });