@visactor/vtable 0.21.3-alpha.2 → 0.22.0-alpha.0

package/es/core/BaseTable.d.ts

@@ -1,5 +1,5 @@
 import { type CellAddress, type CellRange, type TableEventHandlersEventArgumentMap, type TableEventHandlersReturnMap, type TableKeyboardOptions, type DropDownMenuHighlightInfo, type MenuListItem, type WidthModeDef, type ICustomRender, type ICellHeaderPaths, type HeaderData, type FullExtendStyle, type FieldDef, type ColumnTypeOption, type SortState, type IPagination, type ICustomLayout, type CellInfo, type CellStyle, type DropDownMenuOptions, type FieldData, type MaybePromiseOrUndefined, type MousePointerCellEvent, type DropDownMenuEventInfo, type HierarchyState, type FieldKeyDef, type CellLocation, type LayoutObjectId, type HeightModeDef, type ITableThemeDefine } from '../ts-types';
-import type { AnyFunction, CellAddressWithBound, ColumnIconOption, ColumnStyleOption, TableEventOptions } from '../ts-types';
+import type { AnyFunction, CellAddressWithBound, ColumnIconOption, ColumnSeriesNumber, IRowSeriesNumber, ColumnStyleOption, TableEventOptions } from '../ts-types';
 import { TABLE_EVENT_TYPE } from './TABLE_EVENT_TYPE';
 import { EventTarget } from '../event/EventTarget';
 import { NumberMap } from '../tools/NumberMap';
@@ -10,7 +10,7 @@ import { StateManager } from '../state/state';
 import { EventManager } from '../event/event';
 import type { CachedDataSource, DataSource } from '../data';
 import { type ITextSize } from '@visactor/vutils';
-import type { ColumnData, ColumnDefine, ColumnsDefine, IndicatorData } from '../ts-types/list-table/layout-map/api';
+import type { ColumnData, ColumnDefine, ColumnsDefine, IndicatorData, SeriesNumberColumnData } from '../ts-types/list-table/layout-map/api';
 import type { TooltipOptions } from '../ts-types/tooltip';
 import type { BaseTableAPI, BaseTableConstructorOptions, IBaseTableProtected } from '../ts-types/base-table';
 import { DataSet } from '@visactor/vdataset';
@@ -244,8 +244,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     abstract isPivotChart(): boolean;
     protected abstract _getSortFuncFromHeaderOption(columns: ColumnsDefine | undefined, field: FieldDef, fieldKey?: FieldKeyDef): ((v1: any, v2: any, order: string) => 0 | 1 | -1) | undefined;
     abstract setRecords(records: Array<any>, option?: {
-        restoreHierarchyState: boolean;
-        sort?: SortState | SortState[];
+        sortState?: SortState | SortState[];
     }): void;
     abstract refreshHeader(): void;
     abstract refreshRowColCount(): void;
@@ -285,16 +284,16 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     set theme(theme: TableTheme);
     updateTheme(theme: ITableThemeDefine): void;
     getBodyField(col: number, row: number): FieldDef | undefined;
-    getBodyColumnDefine(col: number, row: number): ColumnDefine;
+    getBodyColumnDefine(col: number, row: number): ColumnDefine | IRowSeriesNumber | ColumnSeriesNumber;
     getBodyColumnType(col: number, row: number): ColumnTypeOption;
     getCellType(col: number, row: number): ColumnTypeOption;
     getHeaderField(col: number, row: number): FieldDef;
-    getHeaderDefine(col: number, row: number): ColumnDefine;
+    getHeaderDefine(col: number, row: number): ColumnDefine | IRowSeriesNumber | ColumnSeriesNumber;
     getCellLocation(col: number, row: number): CellLocation;
     getCellHeaderPaths(col: number, row: number): ICellHeaderPaths;
-    getHeadersDefine(col: number, row: number): ColumnDefine[];
-    _getHeaderLayoutMap(col: number, row: number): HeaderData;
-    _getBodyLayoutMap(col: number, row: number): ColumnData | IndicatorData;
+    getHeadersDefine(col: number, row: number): (ColumnDefine | IRowSeriesNumber | ColumnSeriesNumber)[];
+    _getHeaderLayoutMap(col: number, row: number): HeaderData | SeriesNumberColumnData;
+    _getBodyLayoutMap(col: number, row: number): ColumnData | IndicatorData | SeriesNumberColumnData;
     getContext(): CanvasRenderingContext2D;
     getRecordByCell(col: number, row: number): MaybePromiseOrUndefined;
     getRecordByRowCol(col: number, row: number): any;
@@ -308,6 +307,8 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     getHeaderDescription(col: number, row: number): string | undefined;
     setDropDownMenuHighlight(cells: DropDownMenuHighlightInfo[]): void;
     _dropDownMenuIsHighlight(colNow: number, rowNow: number, index: number): boolean;
+    isSeriesNumberInBody(col: number, row: number): boolean;
+    isSeriesNumberInHeader(col: number, row: number): boolean;
     isHeader(col: number, row: number): boolean;
     isColumnHeader(col: number, row: number): boolean;
     isRowHeader(col: number, row: number): boolean;
@@ -368,10 +369,14 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     onVChartEvent(type: string, query: any, callback: AnyFunction): void;
     offVChartEvent(type: string, callback?: AnyFunction): void;
     _bindChartEvent(activeChartInstance: any): void;
+    changeRecordOrder(source: number, target: number): void;
     registerCustomCellStyle(customStyleId: string, customStyle: ColumnStyleOption | undefined | null): void;
     arrangeCustomCellStyle(cellPos: {
         col?: number;
         row?: number;
         range?: CellRange;
     }, customStyleId: string): void;
+    isSeriesNumber(col: number, row: number): boolean;
+    isHasSeriesNumber(): boolean;
+    get leftRowSeriesNumberCount(): number;
 }

package/es/core/BaseTable.js

@@ -64,9 +64,9 @@ import { isLeftOrRightAxis, isTopOrBottomAxis } from "../layout/chart-helper/get
 
 import { NumberRangeMap } from "../layout/row-height-map";
 
-import { CustomCellStylePlugin, mergeStyle } from "../plugins/custom-cell-style";
+import { RowSeriesNumberHelper } from "./row-series-number-helper";
 
-import { hideCellSelectBorder, restoreCellSelectBorder } from "../scenegraph/select/update-select-border";
+import { CustomCellStylePlugin, mergeStyle } from "../plugins/custom-cell-style";
 
 const {toBoxArray: toBoxArray} = utilStyle, {isTouchEvent: isTouchEvent} = event, rangeReg = /^\$(\d+)\$(\d+)$/;
 
@@ -80,10 +80,10 @@ export class BaseTable extends EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        if (super(), this.showFrozenIcon = !0, this.version = "0.21.3-alpha.2", this.id = `VTable${Date.now()}`, 
+        if (super(), this.showFrozenIcon = !0, this.version = "0.22.0-alpha.0", this.id = `VTable${Date.now()}`, 
         this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), 
         !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
-        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, keyboardOptions: keyboardOptions, eventOptions: eventOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
+        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, keyboardOptions: keyboardOptions, eventOptions: eventOptions, rowSeriesNumber: rowSeriesNumber, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
         this.container = container, this.options = options, this.options.container = container, 
         this._widthMode = widthMode, this._heightMode = heightMode, this._autoFillWidth = autoFillWidth, 
         this._autoFillHeight = autoFillHeight, this.customRender = customRender, this.padding = {
@@ -106,9 +106,9 @@ export class BaseTable extends EventTarget {
         internalProps.defaultRowHeight = defaultRowHeight, internalProps.defaultHeaderRowHeight = null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, 
         internalProps.defaultColWidth = defaultColWidth, internalProps.defaultHeaderColWidth = null != defaultHeaderColWidth ? defaultHeaderColWidth : defaultColWidth, 
         internalProps.keyboardOptions = keyboardOptions, internalProps.eventOptions = eventOptions, 
-        internalProps.columnResizeMode = columnResizeMode, internalProps.dragHeaderMode = dragHeaderMode, 
-        internalProps.renderChartAsync = renderChartAsync, setBatchRenderChartCount(renderChartAsyncBatchCount), 
-        internalProps.overscrollBehavior = null != overscrollBehavior ? overscrollBehavior : "auto", 
+        internalProps.rowSeriesNumber = rowSeriesNumber, internalProps.columnResizeMode = columnResizeMode, 
+        internalProps.dragHeaderMode = dragHeaderMode, internalProps.renderChartAsync = renderChartAsync, 
+        setBatchRenderChartCount(renderChartAsyncBatchCount), internalProps.overscrollBehavior = null != overscrollBehavior ? overscrollBehavior : "auto", 
         internalProps._rowHeightsMap = new NumberRangeMap(this), internalProps._rowRangeHeightsMap = new Map, 
         internalProps._colRangeWidthsMap = new Map, internalProps._widthResizedColMap = new Set, 
         this.colWidthsMap = new NumberMap, this.colContentWidthsMap = new NumberMap, this.colWidthsLimit = {}, 
@@ -123,8 +123,8 @@ export class BaseTable extends EventTarget {
         container.appendChild(internalProps.element), this._updateSize()) : this._updateSize(), 
         this.options = options, internalProps.theme = themes.of(null !== (_b = options.theme) && void 0 !== _b ? _b : themes.DEFAULT), 
         internalProps.theme.isPivot = this.isPivotTable(), internalProps.bodyHelper = new BodyHelper(this), 
-        internalProps.headerHelper = new HeaderHelper(this), internalProps.autoWrapText = options.autoWrapText, 
-        internalProps.allowFrozenColCount = null !== (_c = options.allowFrozenColCount) && void 0 !== _c ? _c : 0, 
+        internalProps.headerHelper = new HeaderHelper(this), internalProps.rowSeriesNumberHelper = new RowSeriesNumberHelper(this), 
+        internalProps.autoWrapText = options.autoWrapText, internalProps.allowFrozenColCount = null !== (_c = options.allowFrozenColCount) && void 0 !== _c ? _c : 0, 
         internalProps.limitMaxAutoWidth = null !== (_d = options.limitMaxAutoWidth) && void 0 !== _d ? _d : 450, 
         internalProps.limitMinWidth = null != limitMinWidth ? "number" == typeof limitMinWidth ? limitMinWidth : limitMinWidth ? 10 : 0 : 10, 
         this._vDataSet = new DataSet, this.scenegraph = new Scenegraph(this), this.stateManager = new StateManager(this), 
@@ -726,7 +726,7 @@ export class BaseTable extends EventTarget {
     updateOption(options) {
         var _a, _b, _c, _d, _e;
         this.options = options;
-        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth = 80, keyboardOptions: keyboardOptions, eventOptions: eventOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, pixelRatio: pixelRatio, widthMode: widthMode, heightMode: heightMode, autoFillWidth: autoFillWidth, autoFillHeight: autoFillHeight, customRender: customRender, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
+        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth = 80, keyboardOptions: keyboardOptions, eventOptions: eventOptions, rowSeriesNumber: rowSeriesNumber, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, pixelRatio: pixelRatio, widthMode: widthMode, heightMode: heightMode, autoFillWidth: autoFillWidth, autoFillHeight: autoFillHeight, customRender: customRender, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
         pixelRatio && pixelRatio !== this.internalProps.pixelRatio && (this.internalProps.pixelRatio = pixelRatio), 
         padding && ("number" == typeof padding ? (this.padding.top = padding, this.padding.left = padding, 
         this.padding.bottom = padding, this.padding.right = padding) : (padding.top && (this.padding.top = padding.top), 
@@ -742,9 +742,9 @@ export class BaseTable extends EventTarget {
         internalProps.defaultHeaderRowHeight = null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, 
         internalProps.defaultColWidth = defaultColWidth, internalProps.defaultHeaderColWidth = null != defaultHeaderColWidth ? defaultHeaderColWidth : defaultColWidth, 
         internalProps.keyboardOptions = keyboardOptions, internalProps.eventOptions = eventOptions, 
-        internalProps.columnResizeMode = columnResizeMode, internalProps.dragHeaderMode = dragHeaderMode, 
-        internalProps.renderChartAsync = renderChartAsync, setBatchRenderChartCount(renderChartAsyncBatchCount), 
-        internalProps.overscrollBehavior = null != overscrollBehavior ? overscrollBehavior : "auto", 
+        internalProps.rowSeriesNumber = rowSeriesNumber, internalProps.columnResizeMode = columnResizeMode, 
+        internalProps.dragHeaderMode = dragHeaderMode, internalProps.renderChartAsync = renderChartAsync, 
+        setBatchRenderChartCount(renderChartAsyncBatchCount), internalProps.overscrollBehavior = null != overscrollBehavior ? overscrollBehavior : "auto", 
         internalProps.cellTextOverflows = {}, internalProps._rowHeightsMap = new NumberRangeMap(this), 
         internalProps._rowRangeHeightsMap = new Map, internalProps._colRangeWidthsMap = new Map, 
         internalProps._widthResizedColMap = new Set, this.colWidthsMap = new NumberMap, 
@@ -996,10 +996,10 @@ export class BaseTable extends EventTarget {
     }
     getCellType(col, row) {
         let cellType;
-        return cellType = this.isHeader(col, row) ? this.internalProps.layoutMap.getHeader(col, row).headerType : this.internalProps.layoutMap.getBody(col, row).cellType, 
+        return this.isSeriesNumberInHeader(col, row) ? this.internalProps.layoutMap.getSeriesNumberHeader(col, row).cellType : (cellType = this.isHeader(col, row) ? this.internalProps.layoutMap.getHeader(col, row).headerType : this.internalProps.layoutMap.getBody(col, row).cellType, 
         getProp("cellType", {
             cellType: cellType
-        }, col, row, this);
+        }, col, row, this));
     }
     getHeaderField(col, row) {
         return this.internalProps.layoutMap.getHeaderField(col, row);
@@ -1103,6 +1103,12 @@ export class BaseTable extends EventTarget {
     _dropDownMenuIsHighlight(colNow, rowNow, index) {
         return this.stateManager.dropDownMenuIsHighlight(colNow, rowNow, index);
     }
+    isSeriesNumberInBody(col, row) {
+        return this.internalProps.layoutMap && this.internalProps.layoutMap.isSeriesNumberInBody(col, row);
+    }
+    isSeriesNumberInHeader(col, row) {
+        return this.internalProps.layoutMap && this.internalProps.layoutMap.isSeriesNumberInHeader(col, row);
+    }
     isHeader(col, row) {
         return this.internalProps.layoutMap && this.internalProps.layoutMap.isHeader(col, row);
     }
@@ -1225,7 +1231,7 @@ export class BaseTable extends EventTarget {
         let cacheKey;
         const cellType = this.getCellType(col, row);
         let cacheStyle;
-        if (cacheKey = this.isListTable() && !this.transpose || this.isPivotTable() && this.internalProps.layoutMap.indicatorsAsCol ? col + cellType : row + cellType, 
+        if (cacheKey = this.isSeriesNumberInBody(col, row) ? `${col}-series-` + cellType : this.isListTable() && !this.transpose || this.isPivotTable() && this.internalProps.layoutMap.indicatorsAsCol ? col + cellType : row + cellType, 
         cacheStyle = layoutMap.isBottomFrozenRow(row) ? this.bodyBottomStyleCache.get(cacheKey) : this.bodyStyleCache.get(cacheKey), 
         cacheStyle) return customCellStyle ? mergeStyle(cacheStyle, customCellStyle) : cacheStyle;
         const column = layoutMap.getBody(col, row), styleClass = this.internalProps.bodyHelper.getStyleClass(this.getCellType(col, row)), style = null == column ? void 0 : column.style;
@@ -1282,8 +1288,13 @@ export class BaseTable extends EventTarget {
         return !1;
     }
     getCellIcons(col, row) {
+        var _a, _b;
         let icons;
-        if (this.isHeader(col, row)) icons = this.internalProps.headerHelper.getIcons(col, row); else {
+        if (this.isHeader(col, row)) icons = this.internalProps.headerHelper.getIcons(col, row); else if (this.internalProps.layoutMap.isSeriesNumber(col, row)) {
+            (null === (_b = null === (_a = this.internalProps.layoutMap.getSeriesNumberBody(col, row)) || void 0 === _a ? void 0 : _a.define) || void 0 === _b ? void 0 : _b.dragOrder) && (icons = this.internalProps.rowSeriesNumberHelper.getIcons(col, row));
+            const cellValue = this.getCellValue(col, row), dataValue = this.getCellOriginValue(col, row), ctx = this.internalProps.context, cellIcon = this.internalProps.bodyHelper.getIcons(col, row, cellValue, dataValue, ctx);
+            (null == icons ? void 0 : icons.length) > 0 ? icons = icons.concat() : (null == cellIcon ? void 0 : cellIcon.length) > 0 && (icons = cellIcon);
+        } else {
             const cellValue = this.getCellValue(col, row), dataValue = this.getCellOriginValue(col, row), ctx = this.internalProps.context;
             icons = this.internalProps.bodyHelper.getIcons(col, row, cellValue, dataValue, ctx);
         }
@@ -1512,20 +1523,14 @@ export class BaseTable extends EventTarget {
         return this.scenegraph.stage.toCanvas().toDataURL();
     }
     exportCellImg(col, row) {
-        var _a, _b, _c, _d;
         const isInView = this.cellIsInVisualView(col, row), {scrollTop: scrollTop, scrollLeft: scrollLeft} = this;
         isInView || this.scrollToCell({
             col: col,
             row: row
         });
-        const cellRect = this.getCellRelativeRect(col, row);
-        (null === (_b = null === (_a = this.stateManager.select) || void 0 === _a ? void 0 : _a.ranges) || void 0 === _b ? void 0 : _b.length) > 0 && hideCellSelectBorder(this.scenegraph);
-        const {col: hoverCol, row: hoverRow} = this.stateManager.hover.cellPos;
-        this.stateManager.updateHoverPos(-1, -1);
-        const c = this.scenegraph.stage.toCanvas(!1, (new AABBBounds).set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
+        const cellRect = this.getCellRelativeRect(col, row), c = this.scenegraph.stage.toCanvas(!1, (new AABBBounds).set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
         return isInView || (this.setScrollTop(scrollTop), this.setScrollLeft(scrollLeft)), 
-        (null === (_d = null === (_c = this.stateManager.select) || void 0 === _c ? void 0 : _c.ranges) || void 0 === _d ? void 0 : _d.length) > 0 && restoreCellSelectBorder(this.scenegraph), 
-        this.stateManager.updateHoverPos(hoverCol, hoverRow), c.toDataURL();
+        c.toDataURL();
     }
     exportCellRangeImg(cellRange) {
         const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, minCol = Math.min(cellRange.start.col, cellRange.end.col), minRow = Math.min(cellRange.start.row, cellRange.end.row), maxCol = Math.max(cellRange.start.col, cellRange.end.col), maxRow = Math.max(cellRange.start.row, cellRange.end.row), isInView = this.cellIsInVisualView(minCol, minRow), isMaxCellInView = this.cellIsInVisualView(maxCol, maxRow);
@@ -1591,11 +1596,23 @@ export class BaseTable extends EventTarget {
             e.query ? activeChartInstance.on(key, e.query, e.callback) : activeChartInstance.on(key, e.callback);
         }));
     }
+    changeRecordOrder(source, target) {}
     registerCustomCellStyle(customStyleId, customStyle) {
         this.customCellStylePlugin.registerCustomCellStyle(customStyleId, customStyle);
     }
     arrangeCustomCellStyle(cellPos, customStyleId) {
         this.customCellStylePlugin.arrangeCustomCellStyle(cellPos, customStyleId);
     }
+    isSeriesNumber(col, row) {
+        return this.internalProps.layoutMap.isSeriesNumber(col, row);
+    }
+    isHasSeriesNumber() {
+        var _a;
+        return (null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.leftRowSeriesNumberColumnCount) > 0;
+    }
+    get leftRowSeriesNumberCount() {
+        var _a, _b;
+        return null !== (_b = null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.leftRowSeriesNumberColumnCount) && void 0 !== _b ? _b : 0;
+    }
 }
 //# sourceMappingURL=BaseTable.js.map