@visactor/vtable 0.9.2-alpha.3 → 0.9.2

package/es/core/BaseTable.js

@@ -34,7 +34,7 @@ import { BodyHelper } from "../body-helper/body-helper";
 
 import { HeaderHelper } from "../header-helper/header-helper";
 
-import { TooltipHandler } from "../components/tooltip/TooltipHandler";
+import { TooltipHandler } from "../tooltip/TooltipHandler";
 
 import { isBoolean } from "@visactor/vutils";
 
@@ -48,36 +48,27 @@ import { IconCache } from "../plugins/icons";
 
 import { _applyColWidthLimits, _getScrollableVisibleRect, _getTargetFrozenColAt, _getTargetFrozenRowAt, _setDataSource, _setRecords, _toPxWidth, createRootElement, getStyleTheme, isAutoDefine, updateRootElementPadding } from "./tableHelper";
 
-import { MenuHandler } from "../components/menu/dom/MenuHandler";
+import { MenuHandler } from "../menu/dom/MenuHandler";
 
 import { FocusInput } from "./FouseInput";
 
 import { defaultPixelRatio } from "../tools/pixel-ratio";
 
-import { TableLegend } from "../components/legend/legend";
-
-import { DataSet } from "@visactor/vdataset";
-
-import { Title } from "../components/title/title";
-
 const {toBoxArray: toBoxArray} = utilStyle, {isTouchEvent: isTouchEvent} = event, rangeReg = /^\$(\d+)\$(\d+)$/;
 
 importStyle();
 
-const EMPTY_STYLE = {};
-
 export class BaseTable extends EventTarget {
     static get EVENT_TYPE() {
         return TABLE_EVENT_TYPE;
     }
     constructor(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.2-alpha.3", this.id = `VTable${Date.now()}`, 
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        super(), this.showFrozenIcon = !0, this.showSort = !0, this.version = "0.9.2", this.id = `VTable${Date.now()}`, 
         this.throttleInvalidate = throttle2(this.invalidate.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 = {
+        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", 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.customRender = customRender, 
+        this.padding = {
             top: 0,
             right: 0,
             left: 0,
@@ -89,6 +80,7 @@ export class BaseTable extends EventTarget {
         this.tableNoFrameHeight = 0;
         const internalProps = this.internalProps = {};
         void 0 !== showFrozenIcon && (this.showFrozenIcon = showFrozenIcon), "number" == typeof allowFrozenColCount && allowFrozenColCount <= 0 && (this.showFrozenIcon = !1), 
+        internalProps.autoRowHeight = null !== (_a = options.autoRowHeight) && void 0 !== _a && _a, 
         internalProps.handler = new EventHandler, internalProps.element = createRootElement(this.padding), 
         internalProps.focusControl = new FocusInput(this, internalProps.element), internalProps.pixelRatio = pixelRatio, 
         internalProps.canvas = document.createElement("canvas"), internalProps.element.appendChild(internalProps.canvas), 
@@ -105,29 +97,23 @@ export class BaseTable extends EventTarget {
                 var _a;
                 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), 
+        }, internalProps.cellTextOverflows = {}, internalProps.focusedTable = !1, internalProps.theme = themes.of(null !== (_b = options.theme) && void 0 !== _b ? _b : themes.DEFAULT), 
         parentElement ? (parentElement.innerHTML = "", parentElement.appendChild(internalProps.element), 
-        this._updateSize()) : this._updateSize(), this.options = options, internalProps.theme = themes.of(null !== (_b = options.theme) && void 0 !== _b ? _b : themes.DEFAULT), 
+        this._updateSize()) : this._updateSize(), this._cellToBeInvalidatedNextFrame = new Set, 
+        this._willNextFrameInvalidate = !1, this.options = options, internalProps.theme = themes.of(null !== (_c = options.theme) && void 0 !== _c ? _c : 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, 
-        internalProps.limitMaxAutoWidth = null !== (_d = options.limitMaxAutoWidth) && void 0 !== _d ? _d : 450, 
-        this.dataSet = new DataSet, this.scenegraph = new Scenegraph(this), this.stateManeger = new StateManeger(this), 
-        this.eventManeger = new EventManeger(this), options.legends && (internalProps.legends = new TableLegend(options.legends, this), 
-        this.scenegraph.tableGroup.setAttributes({
-            x: this.tableX,
-            y: this.tableY
-        })), options.title && (internalProps.title = new Title(options.title, this), this.scenegraph.tableGroup.setAttributes({
-            x: this.tableX,
-            y: this.tableY
-        })), internalProps.tooltip = Object.assign({
+        internalProps.autoWrapText = options.autoWrapText, internalProps.allowFrozenColCount = null !== (_d = options.allowFrozenColCount) && void 0 !== _d ? _d : internalProps.colCount, 
+        internalProps.limitMaxAutoWidth = null !== (_e = options.limitMaxAutoWidth) && void 0 !== _e ? _e : 450, 
+        this.scenegraph = new Scenegraph(this), this.stateManeger = new StateManeger(this), 
+        this.eventManeger = new EventManeger(this), internalProps.tooltip = Object.assign({
             renderMode: "html",
             isShowOverflowTextTooltip: !1,
             confine: !0
         }, options.tooltip), "html" === internalProps.tooltip.renderMode && (internalProps.tooltipHandler = new TooltipHandler(this, internalProps.tooltip.confine)), 
         internalProps.menu = Object.assign({
             renderMode: "html"
-        }, options.menu), Array.isArray(null === (_e = options.menu) || void 0 === _e ? void 0 : _e.dropDownMenuHighlight) && this.setDropDownMenuHighlight(null === (_f = options.menu) || void 0 === _f ? void 0 : _f.dropDownMenuHighlight), 
-        Array.isArray(null === (_g = options.menu) || void 0 === _g ? void 0 : _g.defaultHeaderMenuItems) && (this.globalDropDownMenu = options.menu.defaultHeaderMenuItems), 
+        }, options.menu), Array.isArray(null === (_f = options.menu) || void 0 === _f ? void 0 : _f.dropDownMenuHighlight) && this.setDropDownMenuHighlight(null === (_g = options.menu) || void 0 === _g ? void 0 : _g.dropDownMenuHighlight), 
+        Array.isArray(null === (_h = options.menu) || void 0 === _h ? void 0 : _h.defaultHeaderMenuItems) && (this.globalDropDownMenu = options.menu.defaultHeaderMenuItems), 
         "html" === internalProps.menu.renderMode && (internalProps.menuHandler = new MenuHandler(this)), 
         this.headerStyleCache = new Map, this.bodyStyleCache = new Map;
     }
@@ -256,18 +242,6 @@ export class BaseTable extends EventTarget {
     set widthMode(widthMode) {
         widthMode !== this._widthMode && (this._widthMode = widthMode);
     }
-    get heightMode() {
-        return this._heightMode;
-    }
-    set heightMode(heightMode) {
-        heightMode !== this._heightMode && (this._heightMode = heightMode);
-    }
-    get autoFillWidth() {
-        return this._autoFillWidth;
-    }
-    set autoFillWidth(autoFillWidth) {
-        autoFillWidth !== this._autoFillWidth && (this._autoFillWidth = autoFillWidth);
-    }
     _colWidthDefineToPxWidth(width) {
         return isAutoDefine(width) ? _toPxWidth(this, this._calculateAutoColWidthExpr()) : _toPxWidth(this, width);
     }
@@ -352,7 +326,7 @@ export class BaseTable extends EventTarget {
         widths.forEach(((value, index) => this.setColWidth(index, value)));
     }
     getColsWidth(startCol, endCol) {
-        var _a, _b;
+        var _a;
         endCol = Math.min(endCol, this.colCount - 1);
         const cachedColWidth = this._colRangeWidthsMap.get(`$${startCol}$${endCol}`);
         if (null != cachedColWidth) return cachedColWidth;
@@ -360,13 +334,13 @@ export class BaseTable extends EventTarget {
         if (null != cachedLowerColWidth) {
             const width = this.colWidthsMap.get(endCol);
             let adjustW;
-            adjustW = width ? "adaptive" === this.widthMode || this.transpose ? Number(width) : this._adjustColWidth(endCol, this._colWidthDefineToPxWidth(width)) : this.isRowHeader(endCol, 0) || this.isCornerHeader(endCol, 0) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_a = this.defaultHeaderColWidth[endCol]) && void 0 !== _a ? _a : this.internalProps.defaultColWidth : this.defaultHeaderColWidth : this.internalProps.defaultColWidth;
+            adjustW = width ? "adaptive" === this.widthMode || this.transpose ? Number(width) : this._adjustColWidth(endCol, this._colWidthDefineToPxWidth(width)) : 0;
             const addWidth = cachedLowerColWidth + adjustW;
             return startCol >= 0 && endCol >= 0 && !Number.isNaN(addWidth) && this._colRangeWidthsMap.set(`$${startCol}$${endCol}`, Math.round(addWidth)), 
             Math.round(addWidth);
         }
         let w = 0;
-        for (let col = startCol; col <= endCol; col++) w += this.isRowHeader(col, 0) || this.isCornerHeader(col, 0) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_b = this.defaultHeaderColWidth[col]) && void 0 !== _b ? _b : this.internalProps.defaultColWidth : this.defaultHeaderColWidth : this.internalProps.defaultColWidth;
+        for (let col = startCol; col <= endCol; col++) w += this.isRowHeader(col, 0) || this.isCornerHeader(col, 0) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_a = this.defaultHeaderColWidth[col]) && void 0 !== _a ? _a : this.internalProps.defaultColWidth : this.defaultHeaderColWidth : this.internalProps.defaultColWidth;
         this.colWidthsMap.each(startCol, endCol, ((width, col) => {
             var _a;
             w += ("adaptive" === this.widthMode || this.transpose ? Number(width) : this._adjustColWidth(col, this._colWidthDefineToPxWidth(width))) - (this.isRowHeader(col, 0) || this.isCornerHeader(col, 0) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_a = this.defaultHeaderColWidth[col]) && void 0 !== _a ? _a : this.internalProps.defaultColWidth : this.defaultHeaderColWidth : this.internalProps.defaultColWidth);
@@ -380,8 +354,8 @@ export class BaseTable extends EventTarget {
         Math.round(w);
     }
     getRowHeight(row) {
-        var _a, _b;
-        return this.rowHeightsMap.get(row) ? this.rowHeightsMap.get(row) : this.isColumnHeader(0, row) || this.isCornerHeader(0, row) ? Array.isArray(this.defaultHeaderRowHeight) ? null !== (_a = this.defaultHeaderRowHeight[row]) && void 0 !== _a ? _a : this.internalProps.defaultRowHeight : this.defaultHeaderRowHeight : this.isBottomFrozenRow(this.rowHeaderLevelCount, row) ? Array.isArray(this.defaultHeaderRowHeight) ? null !== (_b = this.defaultHeaderRowHeight[row]) && void 0 !== _b ? _b : this.internalProps.defaultRowHeight : this.defaultHeaderRowHeight : this.internalProps.defaultRowHeight;
+        var _a;
+        return this.rowHeightsMap.get(row) || (this.isColumnHeader(0, row) || this.isCornerHeader(0, row) ? Array.isArray(this.defaultHeaderRowHeight) ? null !== (_a = this.defaultHeaderRowHeight[row]) && void 0 !== _a ? _a : this.internalProps.defaultRowHeight : this.defaultHeaderRowHeight : this.internalProps.defaultRowHeight);
     }
     setRowHeight(row, height, clearCache) {
         this.rowHeightsMap.put(row, Math.round(height)), clearCache && this._clearRowRangeHeightsMap(row);
@@ -402,7 +376,7 @@ export class BaseTable extends EventTarget {
             height;
         }
         let h = 0;
-        if ("autoHeight" !== this.heightMode && this.internalProps.layoutMap && endRow >= this.columnHeaderLevelCount) {
+        if (!this.internalProps.autoRowHeight && this.internalProps.layoutMap && endRow >= this.columnHeaderLevelCount) {
             for (let i = startRow; i < this.columnHeaderLevelCount; i++) h += this.getRowHeight(i);
             h += this.defaultRowHeight * (endRow - Math.max(this.columnHeaderLevelCount, startRow) + 1);
         } else for (let i = startRow; i <= endRow; i++) h += this.getRowHeight(i);
@@ -410,9 +384,9 @@ export class BaseTable extends EventTarget {
         Math.round(h);
     }
     getColWidthDefine(col) {
-        var _a, _b;
+        var _a;
         const width = this.colWidthsMap.get(col);
-        return "number" == typeof width && width <= 0 ? 0 : width || (this.isRowHeader(col, 0) || this.isCornerHeader(col, 0) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_a = this.defaultHeaderColWidth[col]) && void 0 !== _a ? _a : this.defaultColWidth : this.defaultHeaderColWidth : this.isRightFrozenColumn(col, this.columnHeaderLevelCount) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_b = this.defaultHeaderColWidth[col]) && void 0 !== _b ? _b : this.defaultColWidth : this.defaultHeaderColWidth : this.defaultColWidth);
+        return "number" == typeof width && width <= 0 ? 0 : width || (this.isRowHeader(col, 0) || this.isCornerHeader(col, 0) ? Array.isArray(this.defaultHeaderColWidth) ? null !== (_a = this.defaultHeaderColWidth[col]) && void 0 !== _a ? _a : this.defaultColWidth : this.defaultHeaderColWidth : this.defaultColWidth);
     }
     getColWidth(col) {
         const width = this.getColWidthDefine(col);
@@ -546,7 +520,7 @@ export class BaseTable extends EventTarget {
         return this.getCellsRectWidth(cellRange.start.col, cellRange.start.row, cellRange.end.col, cellRange.end.row);
     }
     isFrozenCell(col, row) {
-        const {frozenRowCount: frozenRowCount, frozenColCount: frozenColCount} = this.internalProps, isFrozenRow = frozenRowCount > 0 && row < frozenRowCount || this.isBottomFrozenRow(col, row), isFrozenCol = frozenColCount > 0 && col < frozenColCount || this.isRightFrozenColumn(col, row);
+        const {frozenRowCount: frozenRowCount, frozenColCount: frozenColCount} = this.internalProps, isFrozenRow = frozenRowCount > 0 && row < frozenRowCount, isFrozenCol = frozenColCount > 0 && col < frozenColCount;
         return isFrozenRow || isFrozenCol ? {
             row: isFrozenRow,
             col: isFrozenCol
@@ -685,21 +659,20 @@ export class BaseTable extends EventTarget {
         const {parentElement: parentElement} = internalProps.element;
         parentElement && parentElement.removeChild(internalProps.element);
     }
-    fireListeners(type, event) {
-        return super.fireListeners(type, event);
+    fireListeners(type, ...event) {
+        return super.fireListeners(type, ...event);
     }
     updateOption(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         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} = 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), 
         padding.bottom && (this.padding.bottom = padding.bottom), padding.left && (this.padding.left = padding.left), 
         padding.right && (this.padding.right = padding.right))), this.showFrozenIcon = "boolean" != typeof showFrozenIcon || showFrozenIcon, 
         "number" == typeof allowFrozenColCount && allowFrozenColCount <= 0 && (this.showFrozenIcon = !1), 
-        this.widthMode = null != widthMode ? widthMode : "standard", this.heightMode = null != heightMode ? heightMode : "standard", 
-        this.autoFillWidth = null != autoFillWidth && autoFillWidth, this.customRender = customRender;
+        this.widthMode = null != widthMode ? widthMode : "standard";
         const internalProps = this.internalProps;
         "node" !== Env.mode && updateRootElementPadding(internalProps.element, this.padding), 
         internalProps.frozenColCount = frozenColCount, internalProps.defaultRowHeight = defaultRowHeight, 
@@ -707,28 +680,18 @@ export class BaseTable extends EventTarget {
         internalProps.defaultColWidth = defaultColWidth, internalProps.defaultHeaderColWidth = null != defaultHeaderColWidth ? defaultHeaderColWidth : defaultColWidth, 
         internalProps.keyboardOptions = keyboardOptions, internalProps.columnResizeMode = columnResizeMode, 
         internalProps.dragHeaderMode = dragHeaderMode, 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), 
-        internalProps.autoWrapText = options.autoWrapText, internalProps.allowFrozenColCount = null !== (_b = options.allowFrozenColCount) && void 0 !== _b ? _b : internalProps.colCount, 
-        internalProps.limitMaxAutoWidth = null !== (_c = options.limitMaxAutoWidth) && void 0 !== _c ? _c : 450, 
-        this.dataSet = new DataSet, this.scenegraph.clearCells(), this.stateManeger.initState(), 
-        options.legends && (internalProps.legends = new TableLegend(options.legends, this), 
-        this.scenegraph.tableGroup.setAttributes({
-            x: this.tableX,
-            y: this.tableY
-        })), options.title && (internalProps.title = new Title(options.title, this), this.scenegraph.tableGroup.setAttributes({
-            x: this.tableX,
-            y: this.tableY
-        })), internalProps.tooltip = Object.assign({
+        internalProps.theme = themes.of(null !== (_a = options.theme) && void 0 !== _a ? _a : themes.DEFAULT), 
+        internalProps.autoRowHeight = null !== (_b = options.autoRowHeight) && void 0 !== _b && _b, 
+        internalProps.autoWrapText = options.autoWrapText, internalProps.allowFrozenColCount = null !== (_c = options.allowFrozenColCount) && void 0 !== _c ? _c : internalProps.colCount, 
+        internalProps.limitMaxAutoWidth = null !== (_d = options.limitMaxAutoWidth) && void 0 !== _d ? _d : 450, 
+        internalProps.tooltip = Object.assign({
             renderMode: "html",
             isShowOverflowTextTooltip: !1,
             confine: !0
         }, options.tooltip), "html" !== internalProps.tooltip.renderMode || internalProps.tooltipHandler || (internalProps.tooltipHandler = new TooltipHandler(this, internalProps.tooltip.confine)), 
         internalProps.menu = Object.assign({
             renderMode: "html"
-        }, options.menu), "html" !== internalProps.menu.renderMode || internalProps.menuHandler || (internalProps.menuHandler = new MenuHandler(this)), 
-        this.headerStyleCache = new Map, this.bodyStyleCache = new Map;
+        }, options.menu), "html" !== internalProps.menu.renderMode || internalProps.menuHandler || (internalProps.menuHandler = new MenuHandler(this));
     }
     getFrozenRowsHeight() {
         return this.getRowsHeight(0, this.frozenRowCount - 1);
@@ -736,18 +699,6 @@ export class BaseTable extends EventTarget {
     getFrozenColsWidth() {
         return this.getColsWidth(0, this.frozenColCount - 1);
     }
-    getBottomFrozenRowsHeight() {
-        if (this.bottomFrozenRowCount > 0) {
-            return this.getRowsHeight(this.rowCount - this.bottomFrozenRowCount, this.rowCount - 1);
-        }
-        return 0;
-    }
-    getRightFrozenColsWidth() {
-        if (this.rightFrozenColCount > 0) {
-            return this.getColsWidth(this.colCount - this.rightFrozenColCount, this.colCount - 1);
-        }
-        return 0;
-    }
     getDrawRange() {
         const width = Math.min(this.tableNoFrameWidth, this.getAllColsWidth()), height = Math.min(this.tableNoFrameHeight, this.getAllRowsHeight());
         return new Rect(this.tableX, this.tableY, width, height);
@@ -1025,7 +976,7 @@ export class BaseTable extends EventTarget {
                 let order, field, fieldKey;
                 if (Array.isArray(this.sortState) ? 0 !== this.sortState.length && ({order: order, field: field, fieldKey: fieldKey} = null === (_a = this.sortState) || void 0 === _a ? void 0 : _a[0]) : ({order: order, field: field, fieldKey: fieldKey} = this.sortState), 
                 order && field && "normal" !== order) {
-                    const sortFunc = this._getSortFuncFromHeaderOption(void 0, field, fieldKey);
+                    const sortFunc = this.getSortFuncFromHeaderOption(void 0, field, fieldKey);
                     let hd;
                     hd = fieldKey ? this.internalProps.layoutMap.headerObjects.find((col => col && col.fieldKey === fieldKey)) : this.internalProps.layoutMap.headerObjects.find((col => col && col.field === field)), 
                     (null === (_b = null == hd ? void 0 : hd.define) || void 0 === _b ? void 0 : _b.sort) && this.dataSource.sort(hd.field, order, null != sortFunc ? sortFunc : defaultOrderFn);
@@ -1060,14 +1011,6 @@ export class BaseTable extends EventTarget {
         var _a;
         return null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.isCornerHeader(col, row);
     }
-    isRightFrozenColumn(col, row) {
-        var _a;
-        return null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.isRightFrozenColumn(col, row);
-    }
-    isBottomFrozenRow(col, row) {
-        var _a;
-        return null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.isBottomFrozenRow(col, row);
-    }
     getCellInfo(col, row) {
         const colDef = this.isHeader(col, row) ? this.getHeaderDefine(col, row) : this.getBodyColumnDefine(col, row);
         return {
@@ -1099,9 +1042,7 @@ export class BaseTable extends EventTarget {
         if (layoutMap.isHeader(col, row)) {
             let cacheStyle = this.headerStyleCache.get(`${col}-${row}`);
             if (cacheStyle) return cacheStyle;
-            const hd = layoutMap.getHeader(col, row);
-            if (!hd || hd.isEmpty) return EMPTY_STYLE;
-            const styleClass = this.internalProps.headerHelper.getStyleClass(hd.headerType), {style: style} = hd;
+            const hd = layoutMap.getHeader(col, row), styleClass = this.internalProps.headerHelper.getStyleClass(hd.headerType), {style: style} = hd;
             return cacheStyle = headerStyleContents.of(style, layoutMap.isColumnHeader(col, row) ? this.theme.headerStyle : layoutMap.isRowHeader(col, row) ? this.theme.rowHeaderStyle : this.theme.cornerHeaderStyle, {
                 col: col,
                 row: row,