From 9b2cb3574596c5318ac4400fcb085120026cfcd2 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Mon, 1 Jul 2024 14:59:45 +0800 Subject: [PATCH] feat: add PivotTableSample --- .../vtable/__tests__/edit/pivotTable.test.ts | 2 +- .../__tests__/pivotTable-analysis.test.ts | 2 +- .../vtable/__tests__/pivotTable-tree.test.ts | 2 +- packages/vtable/__tests__/pivotTable.test.ts | 2 +- packages/vtable/package.json | 3 +- packages/vtable/src/PivotTable-all.ts | 37 +++++++++++++++++++ packages/vtable/src/PivotTable-simple.ts | 6 +++ packages/vtable/src/PivotTable.ts | 34 ----------------- packages/vtable/src/index.ts | 5 ++- 9 files changed, 53 insertions(+), 40 deletions(-) create mode 100644 packages/vtable/src/PivotTable-all.ts create mode 100644 packages/vtable/src/PivotTable-simple.ts diff --git a/packages/vtable/__tests__/edit/pivotTable.test.ts b/packages/vtable/__tests__/edit/pivotTable.test.ts index 29042df2b..e4820e3f2 100644 --- a/packages/vtable/__tests__/edit/pivotTable.test.ts +++ b/packages/vtable/__tests__/edit/pivotTable.test.ts @@ -2,7 +2,7 @@ // @ts-nocheck // 有问题可对照demo unitTestPivotTable import records from '../data/marketsales.json'; -import { PivotTable } from '../../src/PivotTable'; +import { PivotTable } from '../../src'; import { register } from '../../src'; import { InputEditor } from '@visactor/vtable-editors'; import { createDiv } from '../dom'; diff --git a/packages/vtable/__tests__/pivotTable-analysis.test.ts b/packages/vtable/__tests__/pivotTable-analysis.test.ts index 37ceeaaba..ffff4f483 100644 --- a/packages/vtable/__tests__/pivotTable-analysis.test.ts +++ b/packages/vtable/__tests__/pivotTable-analysis.test.ts @@ -1,7 +1,7 @@ // @ts-nocheck // 有问题可对照demo unitTestPivotTable import records from './data/marketsales.json'; -import { PivotTable } from '../src/PivotTable'; +import { PivotTable } from '../src'; import * as VTable from '../src/index'; import { createDiv } from './dom'; global.__VERSION__ = 'none'; diff --git a/packages/vtable/__tests__/pivotTable-tree.test.ts b/packages/vtable/__tests__/pivotTable-tree.test.ts index be6143c2f..38531f7c2 100644 --- a/packages/vtable/__tests__/pivotTable-tree.test.ts +++ b/packages/vtable/__tests__/pivotTable-tree.test.ts @@ -2,7 +2,7 @@ // @ts-nocheck // 有问题可对照demo unitTestPivotTable import records from './data/North_American_Superstore_pivot_extension_rows.json'; -import { PivotTable } from '../src/PivotTable'; +import { PivotTable } from '../src'; import { createDiv } from './dom'; global.__VERSION__ = 'none'; describe('pivotTableTree init test', () => { diff --git a/packages/vtable/__tests__/pivotTable.test.ts b/packages/vtable/__tests__/pivotTable.test.ts index 8f0dde9ee..9fcf5b10c 100644 --- a/packages/vtable/__tests__/pivotTable.test.ts +++ b/packages/vtable/__tests__/pivotTable.test.ts @@ -2,7 +2,7 @@ // @ts-nocheck // 有问题可对照demo unitTestPivotTable import records from './data/marketsales.json'; -import { PivotTable } from '../src/PivotTable'; +import { PivotTable } from '../src'; import { createDiv } from './dom'; global.__VERSION__ = 'none'; describe('pivotTable init test', () => { diff --git a/packages/vtable/package.json b/packages/vtable/package.json index ccdcf4df4..a1e6a88bd 100644 --- a/packages/vtable/package.json +++ b/packages/vtable/package.json @@ -22,7 +22,8 @@ "sideEffects": [ "./src/ListTable-all.js", "./src/ListTable-simple.js", - "./src/PivotTable.js", + "./src/PivotTable-all.js", + "./src/PivotTable-simple.js", "./src/PivotChart.js", "./src/index.js", "./src/scenegraph/scenegraph.js" diff --git a/packages/vtable/src/PivotTable-all.ts b/packages/vtable/src/PivotTable-all.ts new file mode 100644 index 000000000..caafdc0ed --- /dev/null +++ b/packages/vtable/src/PivotTable-all.ts @@ -0,0 +1,37 @@ +import { PivotTable } from './PivotTable'; +import { + registerAxis, + registerEmptyTip, + registerLegend, + registerMenu, + registerTitle, + registerTooltip +} from './components'; +import { + registerChartCell, + registerCheckboxCell, + registerImageCell, + registerProgressBarCell, + registerRadioCell, + registerSparkLineCell, + registerTextCell, + registerVideoCell +} from './scenegraph/group-creater/cell-type'; + +registerAxis(); +registerEmptyTip(); +registerLegend(); +registerMenu(); +registerTitle(); +registerTooltip(); + +registerChartCell(); +registerCheckboxCell(); +registerImageCell(); +registerProgressBarCell(); +registerRadioCell(); +registerSparkLineCell(); +registerTextCell(); +registerVideoCell(); + +export class PivotTableAll extends PivotTable {} diff --git a/packages/vtable/src/PivotTable-simple.ts b/packages/vtable/src/PivotTable-simple.ts new file mode 100644 index 000000000..f95c2e2a1 --- /dev/null +++ b/packages/vtable/src/PivotTable-simple.ts @@ -0,0 +1,6 @@ +import { PivotTable } from './PivotTable'; +import { registerTextCell } from './scenegraph/group-creater/cell-type'; + +registerTextCell(); + +export class PivotTableSimple extends PivotTable {} diff --git a/packages/vtable/src/PivotTable.ts b/packages/vtable/src/PivotTable.ts index 2c750ee22..fa85cd30d 100644 --- a/packages/vtable/src/PivotTable.ts +++ b/packages/vtable/src/PivotTable.ts @@ -45,40 +45,6 @@ import { cloneDeepSpec } from '@visactor/vutils-extension'; import { parseColKeyRowKeyForPivotTable, supplementIndicatorNodesForCustomTree } from './layout/layout-helper'; import type { IEmptyTipComponent } from './components/empty-tip/empty-tip'; import { Factory } from './core/factory'; -import { - registerAxis, - registerEmptyTip, - registerLegend, - registerMenu, - registerTitle, - registerTooltip -} from './components'; -import { - registerChartCell, - registerCheckboxCell, - registerImageCell, - registerProgressBarCell, - registerRadioCell, - registerSparkLineCell, - registerTextCell, - registerVideoCell -} from './scenegraph/group-creater/cell-type'; - -registerAxis(); -registerEmptyTip(); -registerLegend(); -registerMenu(); -registerTitle(); -registerTooltip(); - -registerChartCell(); -registerCheckboxCell(); -registerImageCell(); -registerProgressBarCell(); -registerRadioCell(); -registerSparkLineCell(); -registerTextCell(); -registerVideoCell(); export class PivotTable extends BaseTable implements PivotTableAPI { layoutNodeId: { seqId: number } = { seqId: 0 }; diff --git a/packages/vtable/src/index.ts b/packages/vtable/src/index.ts index 28daa96df..e0bd280d9 100644 --- a/packages/vtable/src/index.ts +++ b/packages/vtable/src/index.ts @@ -32,7 +32,9 @@ import type { } from './ts-types'; import { ListTableAll as ListTable } from './ListTable-all'; import { ListTableSimple } from './ListTable-simple'; -import { PivotTable } from './PivotTable'; +// import { PivotTable } from './PivotTable'; +import { PivotTableAll as PivotTable } from './PivotTable-all'; +import { PivotTableSimple } from './PivotTable-simple'; import { PivotChart } from './PivotChart'; import type { MousePointerCellEvent } from './ts-types/events'; import * as CustomLayout from './render/layout'; @@ -65,6 +67,7 @@ export { ListTableSimple, ListTableConstructorOptions, PivotTable, + PivotTableSimple, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart,