@visactor/vtable 1.5.2-alpha.1 → 1.5.2

package/cjs/components/react/react-custom-layout.js

@@ -20,29 +20,140 @@ class ReactCustomLayout {
         this.table = table, this.customLayoutFuncCache = new Map, this.reactRemoveGraphicCache = new Map, 
         this.headerCustomLayoutFuncCache = new Map, this.headerReactRemoveGraphicCache = new Map;
     }
-    hasReactCreateGraphic(componentIndex, isHeaderCustomLayout) {
-        return isHeaderCustomLayout ? this.headerCustomLayoutFuncCache.has(componentIndex) : this.customLayoutFuncCache.has(componentIndex);
+    hasReactCreateGraphic(componentId, isHeaderCustomLayout) {
+        return isHeaderCustomLayout ? this.headerCustomLayoutFuncCache.has(componentId) : this.customLayoutFuncCache.has(componentId);
     }
-    setReactCreateGraphic(componentIndex, createGraphic, isHeaderCustomLayout) {
-        isHeaderCustomLayout ? this.headerCustomLayoutFuncCache.set(componentIndex, createGraphic) : this.customLayoutFuncCache.set(componentIndex, createGraphic);
+    setReactCreateGraphic(componentId, createGraphic, isHeaderCustomLayout) {
+        isHeaderCustomLayout ? this.headerCustomLayoutFuncCache.set(componentId, createGraphic) : this.customLayoutFuncCache.set(componentId, createGraphic);
     }
-    setReactRemoveGraphic(componentIndex, removeGraphic, isHeaderCustomLayout) {
-        isHeaderCustomLayout ? this.headerReactRemoveGraphicCache.set(componentIndex, removeGraphic) : this.reactRemoveGraphicCache.set(componentIndex, removeGraphic);
+    setReactRemoveGraphic(componentId, removeGraphic, isHeaderCustomLayout) {
+        isHeaderCustomLayout ? this.headerReactRemoveGraphicCache.set(componentId, removeGraphic) : this.reactRemoveGraphicCache.set(componentId, removeGraphic);
     }
-    updateCustomCell(componentIndex, isHeaderCustomLayout) {
-        const table = this.table, col = componentIndex;
-        if (isHeaderCustomLayout) for (let row = 0; row < table.columnHeaderLevelCount; row++) table.scenegraph.updateCellContent(col, row); else for (let row = table.columnHeaderLevelCount; row < table.rowCount; row++) table.scenegraph.updateCellContent(col, row);
+    updateCustomCell(componentId, isHeaderCustomLayout) {
+        const table = this.table;
+        if (table.isPivotTable()) {
+            const ranges = getUpdateCustomCellRangeInPivotTable(componentId, table, isHeaderCustomLayout);
+            for (let i = 0; i < ranges.length; i++) {
+                const range = ranges[i];
+                for (let col = range.start.col; col <= range.end.col; col++) for (let row = range.start.row; row <= range.end.row; row++) table.scenegraph.updateCellContent(col, row);
+            }
+        } else {
+            const range = getUpdateCustomCellRangeInListTable(componentId, table, isHeaderCustomLayout);
+            for (let col = range.start.col; col <= range.end.col; col++) for (let row = range.start.row; row <= range.end.row; row++) table.scenegraph.updateCellContent(col, row);
+        }
         table.scenegraph.renderSceneGraph();
     }
     getCustomLayoutFunc(col, row) {
-        const {startInTotal: startInTotal} = this.table.getBodyColumnDefine(col, row);
-        return (this.table.isHeader(col, row) ? this.headerCustomLayoutFuncCache.get(startInTotal) : this.customLayoutFuncCache.get(startInTotal)) || emptyCustomLayout;
+        var _a;
+        if (this.table.isHeader(col, row)) {
+            const {componentId: componentId} = this.table.getHeaderDefine(col, row);
+            return null !== (_a = this.headerCustomLayoutFuncCache.get(componentId)) && void 0 !== _a ? _a : emptyCustomLayout;
+        }
+        const {componentId: componentId} = this.table.getBodyColumnDefine(col, row);
+        return this.customLayoutFuncCache.get(componentId) || emptyCustomLayout;
     }
     removeCustomCell(col, row) {
-        const {startInTotal: startInTotal} = this.table.getBodyColumnDefine(col, row), removeFun = this.table.isHeader(col, row) ? this.headerReactRemoveGraphicCache.get(startInTotal) : this.reactRemoveGraphicCache.get(startInTotal);
+        let removeFun;
+        if (this.table.isHeader(col, row)) {
+            const define = this.table.getHeaderDefine(col, row), {componentId: componentId} = define;
+            removeFun = this.headerReactRemoveGraphicCache.get(componentId);
+        } else {
+            const define = this.table.getBodyColumnDefine(col, row), {componentId: componentId} = define;
+            removeFun = this.reactRemoveGraphicCache.get(componentId);
+        }
         removeFun && removeFun(col, row);
     }
 }
 
+function getUpdateCustomCellRangeInListTable(componentId, table, isHeaderCustomLayout) {
+    const rowSeriesNumber = table.internalProps.rowSeriesNumber ? 1 : 0;
+    if (isHeaderCustomLayout) {
+        const layoutMap = table.internalProps.layoutMap, {headerObjects: headerObjects} = table.internalProps.layoutMap;
+        let headerId;
+        for (let i = 0; i < headerObjects.length; i++) {
+            const headerObject = headerObjects[i];
+            if (headerObject.define.componentId === componentId) {
+                headerId = headerObject.id;
+                break;
+            }
+        }
+        const startCell = layoutMap.getHeaderCellAdressById(headerId);
+        return layoutMap.getCellRange(startCell.col, startCell.row);
+    }
+    const {columnObjects: columnObjects} = table.internalProps.layoutMap;
+    for (let i = 0; i < columnObjects.length; i++) {
+        if (columnObjects[i].define.componentId === componentId) return {
+            start: {
+                col: rowSeriesNumber + i,
+                row: table.columnHeaderLevelCount
+            },
+            end: {
+                col: rowSeriesNumber + i,
+                row: table.rowCount - 1
+            }
+        };
+    }
+    return {
+        start: {
+            col: 0,
+            row: 0
+        },
+        end: {
+            col: table.colCount - 1,
+            row: table.rowCount - 1
+        }
+    };
+}
+
+function getUpdateCustomCellRangeInPivotTable(componentId, table, isHeaderCustomLayout) {
+    const rowSeriesNumber = table.internalProps.rowSeriesNumber ? 1 : 0, ranges = [], layoutMap = table.internalProps.layoutMap;
+    if (isHeaderCustomLayout) {
+        const {headerObjects: headerObjects} = layoutMap, headerIds = [];
+        for (let i = 0; i < headerObjects.length; i++) {
+            const headerObject = headerObjects[i];
+            headerObject && (headerObject.define.componentId === componentId && headerIds.push(headerObject.id));
+        }
+        for (let i = 0; i < headerIds.length; i++) {
+            const headerId = headerIds[i], startCell = layoutMap.getHeaderCellAdressById(headerId), range = layoutMap.getCellRange(startCell.col, startCell.row);
+            ranges.push(range);
+        }
+    } else {
+        let columnIndex;
+        const {columnObjects: columnObjects, indicatorsAsCol: indicatorsAsCol} = layoutMap;
+        for (let i = 0; i < columnObjects.length; i++) {
+            if (columnObjects[i].define.componentId === componentId) {
+                columnIndex = i;
+                break;
+            }
+        }
+        if (indicatorsAsCol) for (let column = layoutMap.rowHeaderLevelCount + columnIndex; column < layoutMap.colCount; column += columnObjects.length) {
+            const range = {
+                start: {
+                    col: column + rowSeriesNumber,
+                    row: layoutMap.columnHeaderLevelCount
+                },
+                end: {
+                    col: column + rowSeriesNumber,
+                    row: layoutMap.rowCount - 1
+                }
+            };
+            ranges.push(range);
+        } else for (let row = layoutMap.columnHeaderLevelCount + columnIndex; row < layoutMap.rowCount; row += columnObjects.length) {
+            const range = {
+                start: {
+                    col: layoutMap.rowHeaderLevelCount + rowSeriesNumber,
+                    row: row
+                },
+                end: {
+                    col: layoutMap.colCount - 1,
+                    row: row
+                }
+            };
+            ranges.push(range);
+        }
+    }
+    return ranges;
+}
+
 exports.ReactCustomLayout = ReactCustomLayout;
 //# sourceMappingURL=react-custom-layout.js.map

package/cjs/components/react/react-custom-layout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/components/react/react-custom-layout.ts"],"names":[],"mappings":"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","file":"react-custom-layout.js","sourcesContent":["import { Group } from './../../vrender';\nimport type { CustomRenderFunctionArg, ICustomLayoutFuc } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function emptyCustomLayout(args: CustomRenderFunctionArg) {\n  const group = new Group({});\n  return {\n    rootContainer: group,\n    renderDefault: true\n  };\n}\n\nexport class ReactCustomLayout {\n  table: BaseTableAPI;\n  customLayoutFuncCache: Map<number, ICustomLayoutFuc>;\n  reactRemoveGraphicCache: Map<number, (col: number, row: number) => void>;\n  headerCustomLayoutFuncCache: Map<number, ICustomLayoutFuc>;\n  headerReactRemoveGraphicCache: Map<number, (col: number, row: number) => void>;\n  // reactContainerCache: Map<number, Map<string, any>>;\n  constructor(table: BaseTableAPI) {\n    this.table = table;\n    this.customLayoutFuncCache = new Map();\n    // this.reactContainerCache = new Map();\n    this.reactRemoveGraphicCache = new Map();\n    this.headerCustomLayoutFuncCache = new Map();\n    // this.headerCeactContainerCache = new Map();\n    this.headerReactRemoveGraphicCache = new Map();\n  }\n\n  hasReactCreateGraphic(componentIndex: number, isHeaderCustomLayout?: boolean) {\n    if (isHeaderCustomLayout) {\n      return this.headerCustomLayoutFuncCache.has(componentIndex);\n    }\n    return this.customLayoutFuncCache.has(componentIndex);\n  }\n\n  setReactCreateGraphic(\n    componentIndex: number,\n    createGraphic: ICustomLayoutFuc,\n    // containerCache: Map<string, any>,\n    isHeaderCustomLayout?: boolean\n  ) {\n    if (isHeaderCustomLayout) {\n      this.headerCustomLayoutFuncCache.set(componentIndex, createGraphic);\n    } else {\n      this.customLayoutFuncCache.set(componentIndex, createGraphic);\n    }\n    // this.reactContainerCache.set(componentIndex, containerCache);\n  }\n\n  setReactRemoveGraphic(\n    componentIndex: number,\n    removeGraphic: (col: number, row: number) => void,\n    isHeaderCustomLayout?: boolean\n  ) {\n    if (isHeaderCustomLayout) {\n      this.headerReactRemoveGraphicCache.set(componentIndex, removeGraphic);\n    } else {\n      this.reactRemoveGraphicCache.set(componentIndex, removeGraphic);\n    }\n  }\n\n  updateCustomCell(componentIndex: number, isHeaderCustomLayout?: boolean) {\n    const table = this.table;\n    const col = componentIndex;\n    // to do: deal with transpose table\n    if (isHeaderCustomLayout) {\n      for (let row = 0; row < table.columnHeaderLevelCount; row++) {\n        table.scenegraph.updateCellContent(col, row);\n      }\n    } else {\n      for (let row = table.columnHeaderLevelCount; row < table.rowCount; row++) {\n        table.scenegraph.updateCellContent(col, row);\n      }\n    }\n    // table.scenegraph.updateNextFrame();\n    table.scenegraph.renderSceneGraph(); // use sync render for faster update\n  }\n\n  getCustomLayoutFunc(col: number, row: number) {\n    const { startInTotal } = this.table.getBodyColumnDefine(col, row) as any;\n    const isHeader = this.table.isHeader(col, row);\n    return (\n      (isHeader ? this.headerCustomLayoutFuncCache.get(startInTotal) : this.customLayoutFuncCache.get(startInTotal)) ||\n      emptyCustomLayout\n    );\n  }\n\n  removeCustomCell(col: number, row: number) {\n    const { startInTotal } = this.table.getBodyColumnDefine(col, row) as any;\n    const isHeader = this.table.isHeader(col, row);\n    const removeFun = isHeader\n      ? this.headerReactRemoveGraphicCache.get(startInTotal)\n      : this.reactRemoveGraphicCache.get(startInTotal);\n    if (removeFun) {\n      removeFun(col, row);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/components/react/react-custom-layout.ts"],"names":[],"mappings":"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","file":"react-custom-layout.js","sourcesContent":["import { Group } from './../../vrender';\nimport type { CustomRenderFunctionArg, ICustomLayoutFuc } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport type { SimpleHeaderLayoutMap } from '../../layout';\n\nexport function emptyCustomLayout(args: CustomRenderFunctionArg) {\n  const group = new Group({});\n  return {\n    rootContainer: group,\n    renderDefault: true\n  };\n}\n\nexport class ReactCustomLayout {\n  table: BaseTableAPI;\n  customLayoutFuncCache: Map<string, ICustomLayoutFuc>;\n  reactRemoveGraphicCache: Map<string, (col: number, row: number) => void>;\n  headerCustomLayoutFuncCache: Map<string, ICustomLayoutFuc>;\n  headerReactRemoveGraphicCache: Map<string, (col: number, row: number) => void>;\n  // reactContainerCache: Map<number, Map<string, any>>;\n  constructor(table: BaseTableAPI) {\n    this.table = table;\n    this.customLayoutFuncCache = new Map();\n    // this.reactContainerCache = new Map();\n    this.reactRemoveGraphicCache = new Map();\n    this.headerCustomLayoutFuncCache = new Map();\n    // this.headerCeactContainerCache = new Map();\n    this.headerReactRemoveGraphicCache = new Map();\n  }\n\n  hasReactCreateGraphic(componentId: string, isHeaderCustomLayout?: boolean) {\n    if (isHeaderCustomLayout) {\n      return this.headerCustomLayoutFuncCache.has(componentId);\n    }\n    return this.customLayoutFuncCache.has(componentId);\n  }\n\n  setReactCreateGraphic(\n    componentId: string,\n    createGraphic: ICustomLayoutFuc,\n    // containerCache: Map<string, any>,\n    isHeaderCustomLayout?: boolean\n  ) {\n    if (isHeaderCustomLayout) {\n      this.headerCustomLayoutFuncCache.set(componentId, createGraphic);\n    } else {\n      this.customLayoutFuncCache.set(componentId, createGraphic);\n    }\n    // this.reactContainerCache.set(componentId, containerCache);\n  }\n\n  setReactRemoveGraphic(\n    componentId: string,\n    removeGraphic: (col: number, row: number) => void,\n    isHeaderCustomLayout?: boolean\n  ) {\n    if (isHeaderCustomLayout) {\n      this.headerReactRemoveGraphicCache.set(componentId, removeGraphic);\n    } else {\n      this.reactRemoveGraphicCache.set(componentId, removeGraphic);\n    }\n  }\n\n  updateCustomCell(componentId: string, isHeaderCustomLayout?: boolean) {\n    const table = this.table;\n    // const col = componentId;\n    // // to do: deal with transpose table\n    // if (isHeaderCustomLayout) {\n    //   for (let row = 0; row < table.columnHeaderLevelCount; row++) {\n    //     table.scenegraph.updateCellContent(col, row);\n    //   }\n    // } else {\n    //   for (let row = table.columnHeaderLevelCount; row < table.rowCount; row++) {\n    //     table.scenegraph.updateCellContent(col, row);\n    //   }\n    // }\n\n    if (table.isPivotTable()) {\n      const ranges = getUpdateCustomCellRangeInPivotTable(componentId, table, isHeaderCustomLayout);\n      for (let i = 0; i < ranges.length; i++) {\n        const range = ranges[i];\n        for (let col = range.start.col; col <= range.end.col; col++) {\n          for (let row = range.start.row; row <= range.end.row; row++) {\n            table.scenegraph.updateCellContent(col, row);\n          }\n        }\n      }\n    } else {\n      const range = getUpdateCustomCellRangeInListTable(componentId, table, isHeaderCustomLayout);\n      for (let col = range.start.col; col <= range.end.col; col++) {\n        for (let row = range.start.row; row <= range.end.row; row++) {\n          table.scenegraph.updateCellContent(col, row);\n        }\n      }\n    }\n    // table.scenegraph.updateNextFrame();\n    table.scenegraph.renderSceneGraph(); // use sync render for faster update\n  }\n\n  getCustomLayoutFunc(col: number, row: number) {\n    const isHeader = this.table.isHeader(col, row);\n    if (isHeader) {\n      const { componentId } = this.table.getHeaderDefine(col, row) as any;\n      return this.headerCustomLayoutFuncCache.get(componentId) ?? emptyCustomLayout;\n    }\n    const { componentId } = this.table.getBodyColumnDefine(col, row) as any;\n    return this.customLayoutFuncCache.get(componentId) || emptyCustomLayout;\n  }\n\n  removeCustomCell(col: number, row: number) {\n    // const { startInTotal } = this.table.getBodyColumnDefine(col, row) as any;\n    const isHeader = this.table.isHeader(col, row);\n    let removeFun;\n    if (isHeader) {\n      const define = this.table.getHeaderDefine(col, row);\n      const { componentId } = define as any;\n      removeFun = this.headerReactRemoveGraphicCache.get(componentId);\n    } else {\n      const define = this.table.getBodyColumnDefine(col, row);\n      const { componentId } = define as any;\n      removeFun = this.reactRemoveGraphicCache.get(componentId);\n    }\n    if (removeFun) {\n      removeFun(col, row);\n    }\n  }\n}\n\nfunction getUpdateCustomCellRangeInListTable(componentId: string, table: BaseTableAPI, isHeaderCustomLayout?: boolean) {\n  const rowSeriesNumber = table.internalProps.rowSeriesNumber ? 1 : 0;\n  if (isHeaderCustomLayout) {\n    const layoutMap = table.internalProps.layoutMap as SimpleHeaderLayoutMap;\n    const { headerObjects } = table.internalProps.layoutMap;\n    let headerId: number;\n    for (let i = 0; i < headerObjects.length; i++) {\n      const headerObject = headerObjects[i];\n      if ((headerObject.define as any).componentId === componentId) {\n        headerId = headerObject.id as number;\n        break;\n      }\n    }\n\n    const startCell = layoutMap.getHeaderCellAdressById(headerId);\n    const range = layoutMap.getCellRange(startCell.col, startCell.row);\n    return range;\n\n    // let startCol = -1;\n    // let endCol = -1;\n    // let startRow = -1;\n    // let endRow = -1;\n    // for (let i = 0; i < _headerCellIds.length; i++) {\n    //   const row = _headerCellIds[i];\n    //   let rowHasObject = false;\n    //   for (let j = 0; j < row.length; j++) {\n    //     if (row[j] === headerId) {\n    //       rowHasObject = true;\n    //       if (transpose) {\n    //         // return { col: i, row: j };\n    //         startCol === -1 && (startCol = i);\n    //         startRow === -1 && (startRow = j);\n    //       } else {\n    //         // return { col: j + this.leftRowSeriesNumberColumnCount, row: i };\n    //         startCol === -1 && (startCol = j);\n    //         startRow === -1 && (startRow = i);\n    //       }\n    //     } else {\n    //       if (transpose) {\n    //         // endCol === -1 && startCol !== -1 && (endCol = i);\n    //         endRow === -1 && startRow !== -1 && (endRow = j - 1);\n    //       } else {\n    //         endCol === -1 && startCol !== -1 && (endCol = j - 1);\n    //         // endRow === -1 && startRow !== -1 && (endRow = i);\n    //       }\n    //     }\n\n    //     if (startCol !== -1 && endCol !== -1 && startRow !== -1 && endRow !== -1) {\n    //       break;\n    //     }\n    //   }\n\n    //   if (!rowHasObject) {\n    //     if (transpose) {\n    //       endCol === -1 && startCol !== -1 && (endCol = i - 1);\n    //     } else {\n    //       endRow === -1 && startRow !== -1 && (endRow = i - 1);\n    //     }\n    //   }\n\n    //   if (startCol !== -1 && endCol !== -1 && startRow !== -1 && endRow !== -1) {\n    //     break;\n    //   }\n    // }\n\n    // return {\n    //   startCol: startCol + rowSeriesNumber,\n    //   endCol: endCol + rowSeriesNumber,\n    //   startRow,\n    //   endRow\n    // };\n  }\n  const { columnObjects } = table.internalProps.layoutMap;\n  for (let i = 0; i < columnObjects.length; i++) {\n    const columnObject = columnObjects[i];\n    if ((columnObject.define as any).componentId === componentId) {\n      return {\n        start: {\n          col: rowSeriesNumber + i,\n          row: table.columnHeaderLevelCount\n        },\n        end: {\n          col: rowSeriesNumber + i,\n          row: table.rowCount - 1\n        }\n      };\n    }\n  }\n\n  return {\n    start: {\n      col: 0,\n      row: 0\n    },\n    end: {\n      col: table.colCount - 1,\n      row: table.rowCount - 1\n    }\n  };\n}\n\nfunction getUpdateCustomCellRangeInPivotTable(\n  componentId: string,\n  table: BaseTableAPI,\n  isHeaderCustomLayout?: boolean\n) {\n  const rowSeriesNumber = table.internalProps.rowSeriesNumber ? 1 : 0;\n  const ranges = [];\n  const layoutMap = table.internalProps.layoutMap as PivotHeaderLayoutMap;\n  if (isHeaderCustomLayout) {\n    const { headerObjects } = layoutMap;\n    const headerIds: number[] = [];\n    for (let i = 0; i < headerObjects.length; i++) {\n      const headerObject = headerObjects[i];\n      if (!headerObject) {\n        continue;\n      }\n      if ((headerObject.define as any).componentId === componentId) {\n        headerIds.push(headerObject.id as number);\n      }\n    }\n\n    for (let i = 0; i < headerIds.length; i++) {\n      const headerId = headerIds[i];\n      const startCell = layoutMap.getHeaderCellAdressById(headerId);\n      const range = layoutMap.getCellRange(startCell.col, startCell.row);\n      ranges.push(range);\n    }\n  } else {\n    let columnIndex: number;\n    const { columnObjects, indicatorsAsCol } = layoutMap;\n    for (let i = 0; i < columnObjects.length; i++) {\n      const columnObject = columnObjects[i];\n      if ((columnObject.define as any).componentId === componentId) {\n        columnIndex = i;\n        break;\n      }\n    }\n\n    if (indicatorsAsCol) {\n      for (\n        let column = layoutMap.rowHeaderLevelCount + columnIndex;\n        column < layoutMap.colCount;\n        column += columnObjects.length\n      ) {\n        const range = {\n          start: {\n            col: column + rowSeriesNumber,\n            row: layoutMap.columnHeaderLevelCount\n          },\n          end: {\n            col: column + rowSeriesNumber,\n            row: layoutMap.rowCount - 1\n          }\n        };\n        ranges.push(range);\n      }\n    } else {\n      for (\n        let row = layoutMap.columnHeaderLevelCount + columnIndex;\n        row < layoutMap.rowCount;\n        row += columnObjects.length\n      ) {\n        const range = {\n          start: {\n            col: layoutMap.rowHeaderLevelCount + rowSeriesNumber,\n            row: row\n          },\n          end: {\n            col: layoutMap.colCount - 1,\n            row: row\n          }\n        };\n        ranges.push(range);\n      }\n    }\n  }\n\n  return ranges;\n\n  // return {\n  //   startCol: 0,\n  //   endCol: table.colCount - 1,\n  //   startRow: 0,\n  //   endRow: table.rowCount - 1\n  // };\n}\n"]}

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.5.2-alpha.1", this.id = `VTable${Date.now()}`, 
+        if (super(), this.showFrozenIcon = !0, this.version = "1.5.2", this.id = `VTable${Date.now()}`, 
         this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
         const {frozenColCount: frozenColCount = 0, frozenRowCount: frozenRowCount, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, widthAdaptiveMode: widthAdaptiveMode = "only-body", heightAdaptiveMode: heightAdaptiveMode = "only-body", keyboardOptions: keyboardOptions, eventOptions: eventOptions, rowSeriesNumber: rowSeriesNumber, columnResizeMode: columnResizeMode, rowResizeMode: rowResizeMode = "none", dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth, limitMinHeight: limitMinHeight, clearDOM: clearDOM = !0} = options;