@visactor/vtable 0.9.3-alpha.6 → 0.10.0

package/es/core/BaseTable.d.ts

@@ -41,8 +41,6 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     stateManeger?: StateManeger;
     eventManeger?: EventManeger;
     _pixelRatio: number;
-    bottomFrozenRowCount: number;
-    rightFrozenColCount: number;
     static get EVENT_TYPE(): typeof TABLE_EVENT_TYPE;
     readonly options: BaseTableConstructorOptions;
     version: string;
@@ -50,9 +48,10 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     id: string;
     headerStyleCache: any;
     bodyStyleCache: any;
-    constructor(options?: BaseTableConstructorOptions);
+    container: HTMLElement;
+    constructor(container: HTMLElement, options?: BaseTableConstructorOptions);
     throttleInvalidate: (this: any, ...args: any[]) => void;
-    getParentElement(): HTMLElement;
+    getContainer(): HTMLElement;
     getElement(): HTMLElement;
     get canvas(): HTMLCanvasElement;
     resize(): void;
@@ -67,6 +66,10 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     _resetFrozenColCount(): void;
     get frozenRowCount(): number;
     set frozenRowCount(frozenRowCount: number);
+    get rightFrozenColCount(): number;
+    set rightFrozenColCount(rightFrozenColCount: number);
+    get bottomFrozenRowCount(): number;
+    set bottomFrozenRowCount(bottomFrozenRowCount: number);
     get defaultRowHeight(): number;
     set defaultRowHeight(defaultRowHeight: number);
     get defaultHeaderRowHeight(): number | number[];
@@ -115,7 +118,6 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     getColsWidth(startCol: number, endCol: number): number;
     getRowHeight(row: number): number;
     setRowHeight(row: number, height: number, clearCache?: boolean): void;
-    fillRowsHeight(rowStart: number, rowEnd: number, rowHeight: number): void;
     getRowsHeight(startRow: number, endRow: number): number;
     getColWidthDefine(col: number): string | number;
     getColWidth(col: number): number;
@@ -285,6 +287,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     getSelectedCellInfos(): CellInfo[][];
     measureText(text: string, font: {
         fontSize: number;
+        fontWeight: string | number;
         fontFamily: string;
     }): ITextSize;
     measureTextBounds(attributes: IWrapTextGraphicAttribute): ITextSize;

package/es/core/BaseTable.js

@@ -36,7 +36,7 @@ import { HeaderHelper } from "../header-helper/header-helper";
 
 import { TooltipHandler } from "../components/tooltip/TooltipHandler";
 
-import { isBoolean } from "@visactor/vutils";
+import { isBoolean, isFunction } from "@visactor/vutils";
 
 import { WrapText } from "../scenegraph/graphic/text";
 
@@ -60,6 +60,8 @@ import { DataSet } from "@visactor/vdataset";
 
 import { Title } from "../components/title/title";
 
+import { setBatchRenderChartCount } from "../scenegraph/graphic/contributions/chart-render-helper";
+
 const {toBoxArray: toBoxArray} = utilStyle, {isTouchEvent: isTouchEvent} = event, rangeReg = /^\$(\d+)\$(\d+)$/;
 
 importStyle();
@@ -70,14 +72,15 @@ export class BaseTable extends EventTarget {
     static get EVENT_TYPE() {
         return TABLE_EVENT_TYPE;
     }
-    constructor(options = {}) {
+    constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g;
-        super(), this.showFrozenIcon = !0, this.showSort = !0, this.bottomFrozenRowCount = 0, 
-        this.rightFrozenColCount = 0, this.version = "0.9.3-alpha.6", this.id = `VTable${Date.now()}`, 
-        this.throttleInvalidate = throttle2(this.render.bind(this), 200);
-        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, keyboardOptions: keyboardOptions, parentElement: parentElement, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = defaultPixelRatio} = options;
-        this.options = options, this._widthMode = widthMode, this._heightMode = heightMode, 
-        this._autoFillWidth = autoFillWidth, this.customRender = customRender, this.padding = {
+        if (super(), this.showFrozenIcon = !0, this.showSort = !0, this.version = "0.10.0", 
+        this.id = `VTable${Date.now()}`, this.throttleInvalidate = throttle2(this.render.bind(this), 200), 
+        !container) 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, keyboardOptions: keyboardOptions, 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} = options;
+        this.container = container, this.options = options, this.options.container = container, 
+        this._widthMode = widthMode, this._heightMode = heightMode, this._autoFillWidth = autoFillWidth, 
+        this.customRender = customRender, this.padding = {
             top: 0,
             right: 0,
             left: 0,
@@ -96,7 +99,8 @@ 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.columnResizeMode = columnResizeMode, 
-        internalProps.dragHeaderMode = dragHeaderMode, internalProps._rowHeightsMap = new NumberMap, 
+        internalProps.dragHeaderMode = dragHeaderMode, internalProps.renderChartAsync = renderChartAsync, 
+        setBatchRenderChartCount(renderChartAsyncBatchCount), internalProps._rowHeightsMap = new NumberMap, 
         internalProps._rowRangeHeightsMap = new Map, internalProps._colRangeWidthsMap = new Map, 
         this.colWidthsMap = new NumberMap, this.colContentWidthsMap = new NumberMap, this.colWidthsLimit = {}, 
         internalProps.calcWidthContext = {
@@ -106,7 +110,7 @@ export class BaseTable extends EventTarget {
                 return this._.canvas.width / (null !== (_a = this._.context.pixelRatio) && void 0 !== _a ? _a : window.devicePixelRatio);
             }
         }, internalProps.cellTextOverflows = {}, internalProps.focusedTable = !1, internalProps.theme = themes.of(null !== (_a = options.theme) && void 0 !== _a ? _a : themes.DEFAULT), 
-        parentElement ? (parentElement.innerHTML = "", parentElement.appendChild(internalProps.element), 
+        container ? (container.innerHTML = "", 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.bodyHelper = new BodyHelper(this), internalProps.headerHelper = new HeaderHelper(this), 
         internalProps.autoWrapText = options.autoWrapText, internalProps.allowFrozenColCount = null !== (_c = options.allowFrozenColCount) && void 0 !== _c ? _c : internalProps.colCount, 
@@ -131,8 +135,8 @@ export class BaseTable extends EventTarget {
         "html" === internalProps.menu.renderMode && (internalProps.menuHandler = new MenuHandler(this)), 
         this.headerStyleCache = new Map, this.bodyStyleCache = new Map;
     }
-    getParentElement() {
-        return this.options.parentElement;
+    getContainer() {
+        return this.container;
     }
     getElement() {
         return this.internalProps.element;
@@ -184,6 +188,20 @@ export class BaseTable extends EventTarget {
     set frozenRowCount(frozenRowCount) {
         this.internalProps.frozenRowCount = frozenRowCount;
     }
+    get rightFrozenColCount() {
+        var _a;
+        return null !== (_a = this.internalProps.rightFrozenColCount) && void 0 !== _a ? _a : 0;
+    }
+    set rightFrozenColCount(rightFrozenColCount) {
+        this.scenegraph.dealWidthRightFrozen(rightFrozenColCount);
+    }
+    get bottomFrozenRowCount() {
+        var _a;
+        return null !== (_a = this.internalProps.bottomFrozenRowCount) && void 0 !== _a ? _a : 0;
+    }
+    set bottomFrozenRowCount(bottomFrozenRowCount) {
+        this.scenegraph.dealWidthBottomFrozen(bottomFrozenRowCount);
+    }
     get defaultRowHeight() {
         return this.internalProps.defaultRowHeight;
     }
@@ -350,11 +368,6 @@ export class BaseTable extends EventTarget {
     setRowHeight(row, height, clearCache) {
         this.rowHeightsMap.put(row, Math.round(height)), clearCache && this._clearRowRangeHeightsMap(row);
     }
-    fillRowsHeight(rowStart, rowEnd, rowHeight) {
-        var _a;
-        for (let row = rowStart; row <= rowEnd; row++) this.rowHeightsMap.put(row, Math.round(rowHeight)), 
-        this._rowRangeHeightsMap.set(`$0$${row}`, Math.round((null !== (_a = this._rowRangeHeightsMap.get("$0$" + (row - 1))) && void 0 !== _a ? _a : 0) + rowHeight));
-    }
     getRowsHeight(startRow, endRow) {
         var _a, _b;
         const cachedRowHeight = this._rowRangeHeightsMap.get(`$${startRow}$${endRow}`);
@@ -658,7 +671,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, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, pixelRatio: pixelRatio, widthMode: widthMode, heightMode: heightMode, autoFillWidth: autoFillWidth, customRender: customRender} = options;
+        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth = 80, keyboardOptions: keyboardOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, pixelRatio: pixelRatio, widthMode: widthMode, heightMode: heightMode, autoFillWidth: autoFillWidth, customRender: customRender, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount} = 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), 
@@ -673,7 +686,8 @@ export class BaseTable extends EventTarget {
         internalProps.defaultHeaderRowHeight = null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, 
         internalProps.defaultColWidth = defaultColWidth, internalProps.defaultHeaderColWidth = null != defaultHeaderColWidth ? defaultHeaderColWidth : defaultColWidth, 
         internalProps.keyboardOptions = keyboardOptions, internalProps.columnResizeMode = columnResizeMode, 
-        internalProps.dragHeaderMode = dragHeaderMode, internalProps.cellTextOverflows = {}, 
+        internalProps.dragHeaderMode = dragHeaderMode, internalProps.renderChartAsync = renderChartAsync, 
+        setBatchRenderChartCount(renderChartAsyncBatchCount), internalProps.cellTextOverflows = {}, 
         internalProps._rowHeightsMap = new NumberMap, internalProps._rowRangeHeightsMap = new Map, 
         internalProps._colRangeWidthsMap = new Map, this.colWidthsMap = new NumberMap, this.colContentWidthsMap = new NumberMap, 
         this.colWidthsLimit = {}, internalProps.theme = themes.of(null !== (_a = options.theme) && void 0 !== _a ? _a : themes.DEFAULT), 
@@ -1096,7 +1110,7 @@ export class BaseTable extends EventTarget {
             value: this.getCellValue(col, row),
             dataValue: this.getCellOriginValue(col, row),
             cellHeaderPaths: this.getCellHeaderPaths(col, row)
-        }, styleClass, this.options.autoWrapText), this.bodyStyleCache.set(cacheKey, cacheStyle), 
+        }, styleClass, this.options.autoWrapText), isFunction(style) || this.bodyStyleCache.set(cacheKey, cacheStyle), 
         cacheStyle;
     }
     clearCellStyleCache() {