test: 修复测试

lijinke666 · lijinke666 · commit dc7a9f6a121c · 2021-12-24T10:57:24.000+08:00
diff --git a/packages/s2-core/__tests__/unit/facet/table-facet-spec.ts b/packages/s2-core/__tests__/unit/facet/table-facet-spec.ts
@@ -127,12 +127,12 @@ describe('Table Mode Facet Test With Adaptive Layout', () => {
   });
 
   describe('should get correct col layout with seriesNumber', () => {
-    const ss: SpreadSheet = new MockSpreadSheet();
-    const dataSet: TableDataSet = new MockTableDataSet(ss);
+    const s2: SpreadSheet = new MockSpreadSheet();
+    const s2DataSet: TableDataSet = new MockTableDataSet(s2);
     const facet = new TableFacet({
       ...options,
-      spreadsheet: ss,
-      dataSet,
+      spreadsheet: s2,
+      dataSet: s2DataSet,
       showSeriesNumber: true,
     });
     const { colCfg, cellCfg } = facet.cfg;
@@ -151,12 +151,12 @@ describe('Table Mode Facet Test With Adaptive Layout', () => {
       const seriesNumberNode = colLeafNodes[0];
       expect(seriesNumberNode.y).toBe(0);
       expect(seriesNumberNode.x).toBe(0);
-      // expect(seriesNumberNode.width).toBe(seriesNumberWidth);
+      expect(seriesNumberNode.width).toBe(seriesNumberWidth);
       expect(seriesNumberNode.height).toBe(colCfg.height);
 
       colLeafNodes.slice(1).forEach((node, index) => {
         expect(node.y).toBe(0);
-        // expect(node.x).toBe(index * adaptiveWith + seriesNumberWidth);
+        expect(node.x).toBe(index * adaptiveWith + seriesNumberWidth);
         expect(node.width).toBe(adaptiveWith);
         expect(node.height).toBe(colCfg.height);
       });
@@ -217,7 +217,7 @@ describe('Table Mode Facet Test With Compact Layout', () => {
     test('col hierarchy coordinate with compact layout with seriesNumber', () => {
       const { colLeafNodes } = facet.layoutResult;
 
-      const COMPACT_WIDTH = [52, 52, 64, 40, 72.765625];
+      const COMPACT_WIDTH = [80, 52, 52, 64, 40, 72.765625];
 
       let lastX = 0;
       colLeafNodes.forEach((node, index) => {
diff --git a/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts b/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts
@@ -1,8 +1,7 @@
 import { TableSheet } from 'src/sheet-type';
-import { assembleDataCfg, assembleOptions } from '../../../util';
-import { getContainer } from '../../../util/helpers';
-import { data as originalData } from '../../../data/mock-dataset.json';
-
+import { assembleDataCfg, assembleOptions } from 'tests/util';
+import { getContainer } from 'tests/util/helpers';
+import { data as originalData } from 'tests/data/mock-dataset.json';
 import {
   CellTypes,
   InteractionStateName,
@@ -13,19 +12,26 @@ import { getCellMeta } from '@/utils/interaction/select-event';
 import { S2Event } from '@/common/constant';
 
 describe('List Table Core Data Process', () => {
-  const s2 = new TableSheet(
-    getContainer(),
-    assembleDataCfg({
-      meta: [],
-      fields: {
-        columns: ['province', 'city', 'type', 'sub_type', 'number'],
-      },
-    }),
-    assembleOptions({
-      showSeriesNumber: true,
-    }),
-  );
-  s2.render();
+  let s2: TableSheet;
+  beforeEach(() => {
+    s2 = new TableSheet(
+      getContainer(),
+      assembleDataCfg({
+        meta: [],
+        fields: {
+          columns: ['province', 'city', 'type', 'sub_type', 'number'],
+        },
+      }),
+      assembleOptions({
+        showSeriesNumber: true,
+      }),
+    );
+    s2.render();
+  });
+
+  afterEach(() => {
+    s2.destroy();
+  });
 
   it('should copy no data', () => {
     s2.interaction.changeState({
@@ -73,9 +79,6 @@ describe('List Table Core Data Process', () => {
   });
 
   it('should copy all data', () => {
-    const cell = s2.interaction
-      .getAllCells()
-      .filter(({ cellType }) => cellType === CellTypes.ROW_CELL)[3];
     s2.interaction.changeState({
       stateName: InteractionStateName.ALL_SELECTED,
     });
diff --git a/packages/s2-core/__tests__/unit/utils/merge-spec.ts b/packages/s2-core/__tests__/unit/utils/merge-spec.ts
@@ -4,7 +4,7 @@ import {
   getSafetyDataConfig,
   getSafetyOptions,
 } from '@/utils/merge';
-import type { S2DataConfig, S2Options } from '@/common';
+import type { S2DataConfig } from '@/common';
 
 describe('merge test', () => {
   test('should replace old array with new one', () => {
diff --git a/packages/s2-core/src/facet/layout/build-table-hierarchy.ts b/packages/s2-core/src/facet/layout/build-table-hierarchy.ts
@@ -9,7 +9,7 @@ export const buildTableHierarchy = (params: TableHeaderParams) => {
   const { columns, spreadsheet, dataSet } = facetCfg;
 
   const hiddenColumnsDetail = spreadsheet.store.get('hiddenColumnsDetail');
-  const showSeriesNumber = spreadsheet.options?.showSeriesNumber;
+  const showSeriesNumber = facetCfg?.showSeriesNumber;
 
   const displayedColumns = columns.filter((column) => {
     if (!hiddenColumnsDetail) {
