@visactor/vtable 1.26.4 → 1.26.6

package/cjs/body-helper/body-helper.d.ts

@@ -10,6 +10,7 @@ export declare class BodyHelper {
     collapseIcon: SvgIcon;
     _table: BaseTableAPI;
     constructor(_table: BaseTableAPI);
+    updateIcons(): void;
     getIcons(col: number, row: number, cellValue: any, dataValue: any, context: CanvasRenderingContext2D): ColumnIconOption[];
     getStyleClass(cellType: 'text' | 'link' | 'image' | 'video' | 'chart' | 'sparkline' | 'progressbar' | 'chart' | 'checkbox' | 'radio' | 'switch' | 'button'): typeof Style | typeof RadioStyle | typeof SwitchStyle | typeof ButtonStyle | typeof CheckboxStyle;
     getCellIconFromRecordValue(icon: ColumnIconOption, col: number, row: number): ColumnIconOption;

package/cjs/body-helper/body-helper.js

@@ -33,7 +33,9 @@ const ts_types_1 = require("../ts-types"), registerIcons = __importStar(require(
 
 class BodyHelper {
     constructor(_table) {
-        this._table = _table;
+        this._table = _table, this.updateIcons();
+    }
+    updateIcons() {
         const regedIcons = registerIcons.get();
         this.expandIcon = regedIcons[ts_types_1.InternalIconName.expandIconName], this.collapseIcon = regedIcons[ts_types_1.InternalIconName.collapseIconName];
     }
@@ -117,5 +119,4 @@ class BodyHelper {
     }
 }
 
-exports.BodyHelper = BodyHelper;
-//# sourceMappingURL=body-helper.js.map
+exports.BodyHelper = BodyHelper;

package/cjs/body-helper/body-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/body-helper/body-helper.ts"],"names":[],"mappings":"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","file":"body-helper.js","sourcesContent":["import type { ColumnIconOption, ImageIcon, ListTableAPI, SvgIcon } from '../ts-types';\nimport { HierarchyState, InternalIconName } from '../ts-types';\nimport * as registerIcons from '../icons';\nimport { Style } from './style/Style';\nimport { TextStyle } from './style/MultilineTextStyle';\nimport { ProgressBarStyle } from './style/ProgressBarStyle';\nimport { ImageStyle } from './style/ImageStyle';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport * as icons from '../tools/icons';\nimport { obj } from '../tools/helper';\nimport { CheckboxStyle } from './style/CheckboxStyle';\nimport { RadioStyle } from './style/RadioStyle';\nimport { isValid } from '@visactor/vutils';\nimport { SwitchStyle } from './style/SwitchStyle';\nimport { ButtonStyle } from './style/ButtonStyle';\nexport class BodyHelper {\n  expandIcon: SvgIcon;\n  collapseIcon: SvgIcon;\n  _table: BaseTableAPI;\n  constructor(_table: BaseTableAPI) {\n    this._table = _table;\n    const regedIcons = registerIcons.get();\n    //展开折叠按钮\n    this.expandIcon = regedIcons[InternalIconName.expandIconName] as SvgIcon;\n    this.collapseIcon = regedIcons[InternalIconName.collapseIconName] as SvgIcon;\n  }\n  getIcons(\n    col: number,\n    row: number,\n    cellValue: any,\n    dataValue: any,\n    context: CanvasRenderingContext2D\n  ): ColumnIconOption[] {\n    //加入固定列图标 排序 文本中元素\n    const iconArr: ColumnIconOption[] = [];\n\n    const hierarchyIcon = this.getHierarchyIcon(col, row);\n    if (hierarchyIcon) {\n      iconArr.push(hierarchyIcon);\n    }\n\n    const { icon: iconDefine } = this._table.getBodyColumnDefine(col, row);\n\n    if (iconDefine) {\n      let iconResults;\n      if (typeof iconDefine === 'function') {\n        const arg = {\n          col,\n          row,\n          value: cellValue,\n          dataValue,\n          table: this._table\n        };\n        iconResults = iconDefine(arg);\n      } else {\n        iconResults = iconDefine;\n      }\n      const regedIcons = registerIcons.get();\n      const addIcon = (columnIcon: string | ColumnIconOption) => {\n        let icon;\n        if (typeof columnIcon === 'string') {\n          icon = regedIcons[columnIcon];\n        } else {\n          icon = columnIcon;\n        }\n        if (icon) {\n          iconArr.push(icon);\n        }\n      };\n      if (Array.isArray(iconResults)) {\n        iconResults.forEach((columnIcon: string | ColumnIconOption, index: number) => {\n          addIcon(columnIcon);\n        });\n      } else {\n        addIcon(iconResults);\n      }\n    }\n\n    context &&\n      iconArr.forEach((i, index) => {\n        if ((i as any).content || (<ImageIcon>i).src) {\n          iconArr[index] = this.getCellIconFromRecordValue(i, col, row);\n          // if ((<FontIcon>i).font)\n          //   helper.testFontLoad((<FontIcon>i).font, (<FontIcon>i).content, col, row);\n        }\n      });\n\n    return iconArr;\n  }\n  getStyleClass(\n    cellType:\n      | 'text'\n      | 'link'\n      | 'image'\n      | 'video'\n      | 'chart'\n      | 'sparkline'\n      | 'progressbar'\n      | 'chart'\n      | 'checkbox'\n      | 'radio'\n      | 'switch'\n      | 'button'\n  ) {\n    switch (cellType) {\n      case 'text':\n        return TextStyle;\n      case 'image':\n        return ImageStyle;\n      case 'video':\n        return ImageStyle;\n      case 'link':\n        return TextStyle;\n      case 'chart':\n        return Style;\n      case 'sparkline':\n        return Style;\n      case 'progressbar':\n        return ProgressBarStyle;\n      case 'checkbox':\n        return CheckboxStyle;\n      case 'radio':\n        return RadioStyle;\n      case 'switch':\n        return SwitchStyle;\n      case 'button':\n        return ButtonStyle;\n    }\n    return TextStyle;\n  }\n  getCellIconFromRecordValue(icon: ColumnIconOption, col: number, row: number): ColumnIconOption;\n  getCellIconFromRecordValue(icon: ColumnIconOption[], col: number, row: number): ColumnIconOption[];\n  getCellIconFromRecordValue(\n    icon: ColumnIconOption | ColumnIconOption[],\n    col: number,\n    row: number\n  ): ColumnIconOption | ColumnIconOption[];\n  getCellIconFromRecordValue(\n    icon: ColumnIconOption | ColumnIconOption[],\n    col: number,\n    row: number\n  ): ColumnIconOption | ColumnIconOption[] {\n    if (Array.isArray(icon)) {\n      return icon.map(i => this.getCellIconFromRecordValue(i, col, row));\n    }\n    // icon.positionType = IconPosition.inlineFront;\n    if (!obj.isObject(icon) || typeof icon === 'function') {\n      return (this._table as ListTableAPI).getFieldData(icon, col, row);\n    }\n    // 新建对象 挨个属性赋值\n    const retIcon: any = {};\n    const iconOpt: any = icon;\n    icons.iconPropKeys.forEach(k => {\n      if (typeof iconOpt[k] !== 'undefined') {\n        const f = (this._table as ListTableAPI).getFieldData(iconOpt[k], col, row);\n        if (isValid(f)) {\n          retIcon[k] = f;\n        } else if (!this._table._hasField?.(iconOpt[k], col, row)) {\n          retIcon[k] = iconOpt[k];\n        }\n      }\n    });\n    return retIcon;\n  }\n\n  getHierarchyIcon(col: number, row: number) {\n    const hierarchyState = this._table.getHierarchyState(col, row);\n    if (hierarchyState === HierarchyState.expand) {\n      //展开状态 应该显示-号\n      return this.expandIcon;\n    } else if (hierarchyState === HierarchyState.collapse) {\n      //折叠状态 应该显示-号\n      return this.collapseIcon;\n    }\n    return undefined;\n  }\n  getHierarchyIconWidth() {\n    return this.expandIcon.width + (this.expandIcon.marginLeft ?? 0) + (this.expandIcon.marginRight ?? 0);\n  }\n}\n"]}
+{"version":3,"sources":["../src/body-helper/body-helper.ts"],"names":[],"mappings":"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","file":"body-helper.js","sourcesContent":["import type { ColumnIconOption, ImageIcon, ListTableAPI, SvgIcon } from '../ts-types';\nimport { HierarchyState, InternalIconName } from '../ts-types';\nimport * as registerIcons from '../icons';\nimport { Style } from './style/Style';\nimport { TextStyle } from './style/MultilineTextStyle';\nimport { ProgressBarStyle } from './style/ProgressBarStyle';\nimport { ImageStyle } from './style/ImageStyle';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport * as icons from '../tools/icons';\nimport { obj } from '../tools/helper';\nimport { CheckboxStyle } from './style/CheckboxStyle';\nimport { RadioStyle } from './style/RadioStyle';\nimport { isValid } from '@visactor/vutils';\nimport { SwitchStyle } from './style/SwitchStyle';\nimport { ButtonStyle } from './style/ButtonStyle';\nexport class BodyHelper {\n  expandIcon: SvgIcon;\n  collapseIcon: SvgIcon;\n  _table: BaseTableAPI;\n  constructor(_table: BaseTableAPI) {\n    this._table = _table;\n    this.updateIcons();\n  }\n\n  updateIcons() {\n    const regedIcons = registerIcons.get();\n    //展开折叠按钮\n    this.expandIcon = regedIcons[InternalIconName.expandIconName] as SvgIcon;\n    this.collapseIcon = regedIcons[InternalIconName.collapseIconName] as SvgIcon;\n  }\n  getIcons(\n    col: number,\n    row: number,\n    cellValue: any,\n    dataValue: any,\n    context: CanvasRenderingContext2D\n  ): ColumnIconOption[] {\n    //加入固定列图标 排序 文本中元素\n    const iconArr: ColumnIconOption[] = [];\n\n    const hierarchyIcon = this.getHierarchyIcon(col, row);\n    if (hierarchyIcon) {\n      iconArr.push(hierarchyIcon);\n    }\n\n    const { icon: iconDefine } = this._table.getBodyColumnDefine(col, row);\n\n    if (iconDefine) {\n      let iconResults;\n      if (typeof iconDefine === 'function') {\n        const arg = {\n          col,\n          row,\n          value: cellValue,\n          dataValue,\n          table: this._table\n        };\n        iconResults = iconDefine(arg);\n      } else {\n        iconResults = iconDefine;\n      }\n      const regedIcons = registerIcons.get();\n      const addIcon = (columnIcon: string | ColumnIconOption) => {\n        let icon;\n        if (typeof columnIcon === 'string') {\n          icon = regedIcons[columnIcon];\n        } else {\n          icon = columnIcon;\n        }\n        if (icon) {\n          iconArr.push(icon);\n        }\n      };\n      if (Array.isArray(iconResults)) {\n        iconResults.forEach((columnIcon: string | ColumnIconOption, index: number) => {\n          addIcon(columnIcon);\n        });\n      } else {\n        addIcon(iconResults);\n      }\n    }\n\n    context &&\n      iconArr.forEach((i, index) => {\n        if ((i as any).content || (<ImageIcon>i).src) {\n          iconArr[index] = this.getCellIconFromRecordValue(i, col, row);\n          // if ((<FontIcon>i).font)\n          //   helper.testFontLoad((<FontIcon>i).font, (<FontIcon>i).content, col, row);\n        }\n      });\n\n    return iconArr;\n  }\n  getStyleClass(\n    cellType:\n      | 'text'\n      | 'link'\n      | 'image'\n      | 'video'\n      | 'chart'\n      | 'sparkline'\n      | 'progressbar'\n      | 'chart'\n      | 'checkbox'\n      | 'radio'\n      | 'switch'\n      | 'button'\n  ) {\n    switch (cellType) {\n      case 'text':\n        return TextStyle;\n      case 'image':\n        return ImageStyle;\n      case 'video':\n        return ImageStyle;\n      case 'link':\n        return TextStyle;\n      case 'chart':\n        return Style;\n      case 'sparkline':\n        return Style;\n      case 'progressbar':\n        return ProgressBarStyle;\n      case 'checkbox':\n        return CheckboxStyle;\n      case 'radio':\n        return RadioStyle;\n      case 'switch':\n        return SwitchStyle;\n      case 'button':\n        return ButtonStyle;\n    }\n    return TextStyle;\n  }\n  getCellIconFromRecordValue(icon: ColumnIconOption, col: number, row: number): ColumnIconOption;\n  getCellIconFromRecordValue(icon: ColumnIconOption[], col: number, row: number): ColumnIconOption[];\n  getCellIconFromRecordValue(\n    icon: ColumnIconOption | ColumnIconOption[],\n    col: number,\n    row: number\n  ): ColumnIconOption | ColumnIconOption[];\n  getCellIconFromRecordValue(\n    icon: ColumnIconOption | ColumnIconOption[],\n    col: number,\n    row: number\n  ): ColumnIconOption | ColumnIconOption[] {\n    if (Array.isArray(icon)) {\n      return icon.map(i => this.getCellIconFromRecordValue(i, col, row));\n    }\n    // icon.positionType = IconPosition.inlineFront;\n    if (!obj.isObject(icon) || typeof icon === 'function') {\n      return (this._table as ListTableAPI).getFieldData(icon, col, row);\n    }\n    // 新建对象 挨个属性赋值\n    const retIcon: any = {};\n    const iconOpt: any = icon;\n    icons.iconPropKeys.forEach(k => {\n      if (typeof iconOpt[k] !== 'undefined') {\n        const f = (this._table as ListTableAPI).getFieldData(iconOpt[k], col, row);\n        if (isValid(f)) {\n          retIcon[k] = f;\n        } else if (!this._table._hasField?.(iconOpt[k], col, row)) {\n          retIcon[k] = iconOpt[k];\n        }\n      }\n    });\n    return retIcon;\n  }\n\n  getHierarchyIcon(col: number, row: number) {\n    const hierarchyState = this._table.getHierarchyState(col, row);\n    if (hierarchyState === HierarchyState.expand) {\n      //展开状态 应该显示-号\n      return this.expandIcon;\n    } else if (hierarchyState === HierarchyState.collapse) {\n      //折叠状态 应该显示-号\n      return this.collapseIcon;\n    }\n    return undefined;\n  }\n  getHierarchyIconWidth() {\n    return this.expandIcon.width + (this.expandIcon.marginLeft ?? 0) + (this.expandIcon.marginRight ?? 0);\n  }\n}\n"]}

package/cjs/body-helper/style.js

@@ -49,4 +49,5 @@ function of(columnStyle, bodyStyle, styleArg, StyleClassDef = Style_1.Style, glo
     StyleClassDef === CheckboxStyle_1.CheckboxStyle ? new CheckboxStyle_1.CheckboxStyle(null != columnStyle ? columnStyle : {}, null != bodyStyle ? bodyStyle : {}, null !== (_a = theme.checkboxStyle) && void 0 !== _a ? _a : {}) : StyleClassDef === RadioStyle_1.RadioStyle ? new RadioStyle_1.RadioStyle(null != columnStyle ? columnStyle : {}, null != bodyStyle ? bodyStyle : {}, null !== (_b = theme.radioStyle) && void 0 !== _b ? _b : {}) : StyleClassDef === SwitchStyle_1.SwitchStyle ? new SwitchStyle_1.SwitchStyle(null != columnStyle ? columnStyle : {}, null != bodyStyle ? bodyStyle : {}, null !== (_c = theme.switchStyle) && void 0 !== _c ? _c : {}) : StyleClassDef === ButtonStyle_1.ButtonStyle ? new ButtonStyle_1.ButtonStyle(null != columnStyle ? columnStyle : {}, null != bodyStyle ? bodyStyle : {}, null !== (_d = theme.buttonStyle) && void 0 !== _d ? _d : {}) : new StyleClassDef(null != columnStyle ? columnStyle : {}, null != bodyStyle ? bodyStyle : {})) : StyleClassDef.DEFAULT;
 }
 
-exports.EVENT_TYPE = EVENT_TYPE, exports.of = of;
+exports.EVENT_TYPE = EVENT_TYPE, exports.of = of;
+//# sourceMappingURL=style.js.map

package/cjs/components/legend/discrete-legend/discrete-legend.d.ts

@@ -15,7 +15,7 @@ export declare class DiscreteTableLegend {
     resize(): void;
     adjustTableSize(attrs: any): void;
     getLegendAttributes(rect: any): any;
-    getLegendItems(): import("@visactor/vrender-components/es/legend/discrete/type").LegendItemDatum[];
+    getLegendItems(): import("@visactor/vrender-components/legend/discrete/type").LegendItemDatum[];
     initEvent(): void;
     getLegendBounds(): {
         width: number;

package/cjs/core/BaseTable.d.ts

@@ -352,6 +352,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     get enableLineBreak(): boolean;
     set enableLineBreak(enableLineBreak: boolean);
     updateAutoWrapText(autoWrapText: boolean): void;
+    private _updateFunctionalIcons;
     get theme(): TableTheme;
     set theme(theme: TableTheme);
     updateTheme(theme: ITableThemeDefine): void;

package/cjs/core/BaseTable.js

@@ -35,6 +35,10 @@ Object.defineProperty(exports, "__esModule", {
 
 const columnStyleContents = __importStar(require("../body-helper/style")), style_1 = require("./style"), style = __importStar(require("../tools/style")), ts_types_1 = require("../ts-types"), helper_1 = require("../tools/helper"), TABLE_EVENT_TYPE_1 = require("./TABLE_EVENT_TYPE"), EventHandler_1 = require("../event/EventHandler"), EventTarget_1 = require("../event/EventTarget"), NumberMap_1 = require("../tools/NumberMap"), Rect_1 = require("../tools/Rect"), util_1 = require("../tools/util"), themes_1 = __importDefault(require("../themes")), env_1 = require("../tools/env"), scenegraph_1 = require("../scenegraph/scenegraph"), state_1 = require("../state/state"), event_1 = require("../event/event"), body_helper_1 = require("../body-helper/body-helper"), header_helper_1 = require("../header-helper/header-helper"), vutils_1 = require("@visactor/vutils"), text_measure_1 = require("../scenegraph/utils/text-measure"), get_prop_1 = require("../scenegraph/utils/get-prop"), tableHelper_1 = require("./tableHelper"), FouseInput_1 = require("./FouseInput"), pixel_ratio_1 = require("../tools/pixel-ratio"), chart_render_helper_1 = require("../scenegraph/graphic/contributions/chart-render-helper"), row_height_map_1 = require("../layout/row-height-map"), row_series_number_helper_1 = require("./row-series-number-helper"), update_select_border_1 = require("../scenegraph/select/update-select-border"), react_custom_layout_1 = require("../components/react/react-custom-layout"), layout_helper_1 = require("../layout/layout-helper"), factory_1 = require("./factory"), get_cell_position_1 = require("./utils/get-cell-position"), style_helper_1 = require("./style-helper"), frozen_react_1 = require("../scenegraph/layout/frozen-react"), icons_1 = require("../icons"), animation_1 = require("./animation"), check_in_select_1 = require("../state/common/check-in-select"), is_cell_select_highlight_1 = require("../state/select/is-cell-select-highlight"), get_custom_merge_cell_func_1 = require("./utils/get-custom-merge-cell-func"), vrender_1 = require("./../vrender"), plugin_manager_1 = require("../plugins/plugin-manager"), {toBoxArray: toBoxArray} = helper_1.style, {isTouchEvent: isTouchEvent} = helper_1.event, rangeReg = /^\$(\d+)\$(\d+)$/;
 
+function normalizeCellType(cellType) {
+    return (0, vutils_1.isValid)(cellType) ? cellType : "text";
+}
+
 (0, style_1.importStyle)();
 
 class BaseTable extends EventTarget_1.EventTarget {
@@ -45,7 +49,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, 
         this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, 
-        this.version = "1.26.4", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
+        this.version = "1.26.6", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
         this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         "undefined" != typeof window) {
             const g = window;
@@ -57,7 +61,7 @@ class BaseTable extends EventTarget_1.EventTarget {
             });
             registry.byId[this.id] = this, registry.list.push(this), registry.last = this, g.__vtable_last_id__ = this.id;
         }
-        if ("node" === env_1.Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
+        if ("node" === env_1.Env.mode ? (options = container, container = null) : !container || container instanceof HTMLElement || (options = container, 
         container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new plugin_manager_1.PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.BEFORE_INIT, {
             options: options,
@@ -137,7 +141,7 @@ class BaseTable extends EventTarget_1.EventTarget {
                 return "node" === env_1.Env.mode ? that.canvasWidth / (null != pixelRatio ? pixelRatio : 1) : this._.canvas.width / (null !== (_b = null !== (_a = this._.context.pixelRatio) && void 0 !== _a ? _a : that.internalProps.pixelRatio) && void 0 !== _b ? _b : window.devicePixelRatio);
             }
         }, internalProps.cellTextOverflows = {}, internalProps.focusedTable = !1, internalProps.theme = themes_1.default.of(null !== (_r = options.theme) && void 0 !== _r ? _r : themes_1.default.DEFAULT), 
-        internalProps.theme.isPivot = this.isPivotTable(), (0, icons_1.setIconColor)(internalProps.theme.functionalIconsStyle), 
+        internalProps.theme.isPivot = this.isPivotTable(), this._updateFunctionalIcons(), 
         container ? (clearDOM && (container.innerHTML = ""), container.appendChild(internalProps.element), 
         this._updateSize()) : this._updateSize(), internalProps.bodyHelper = new body_helper_1.BodyHelper(this), 
         internalProps.headerHelper = new header_helper_1.HeaderHelper(this), internalProps.rowSeriesNumberHelper = new row_series_number_helper_1.RowSeriesNumberHelper(this), 
@@ -902,7 +906,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     getBodyVisibleCellRange() {
         var _a, _b, _c, _d;
-        const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, frozenColsContentWidth = this.getFrozenColsContentWidth(), frozenColsOffset = this.getFrozenColsOffset(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount), {col: colStart} = this.getColAt(scrollLeft + frozenColsContentWidth + 1), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1, colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
+        const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, frozenColsContentWidth = this.getFrozenColsContentWidth(), frozenColsOffset = this.getFrozenColsOffset(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), frozenHeaderHeight = this.frozenRowCount > this.columnHeaderLevelCount ? this.getRowsHeight(0, this.columnHeaderLevelCount - 1) : 0, rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount), {col: colStart} = this.getColAt(scrollLeft + frozenColsContentWidth + 1), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight - frozenHeaderHeight)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1, colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
         return colEnd < 0 || rowEnd < 0 ? null : {
             rowStart: rowStart,
             colStart: colStart,
@@ -912,7 +916,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     getBodyVisibleRowRange(start_deltaY = 0, end_deltaY = 0) {
         var _a, _b, _c, _d;
-        const {scrollTop: scrollTop} = this, bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1 + start_deltaY)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight + end_deltaY)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1;
+        const {scrollTop: scrollTop} = this, bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), frozenHeaderHeight = this.frozenRowCount > this.columnHeaderLevelCount ? this.getRowsHeight(0, this.columnHeaderLevelCount - 1) : 0, rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1 + start_deltaY)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight - frozenHeaderHeight + end_deltaY)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1;
         return rowEnd < 0 ? null : {
             rowStart: rowStart,
             rowEnd: rowEnd
@@ -976,7 +980,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         this._scrollToRowCorrectTimer && (clearTimeout(this._scrollToRowCorrectTimer), this._scrollToRowCorrectTimer = null);
     }
     release() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
         if ("undefined" != typeof window) {
             const g = window;
             (null == g ? void 0 : g[this.id]) === this ? delete g[this.id] : (null == g ? void 0 : g[this.id]) && (g[this.id] = null);
@@ -990,29 +994,29 @@ class BaseTable extends EventTarget_1.EventTarget {
         if (this.isReleased) return;
         null === (_f = null === (_e = null === (_d = this.scenegraph) || void 0 === _d ? void 0 : _d.component) || void 0 === _e ? void 0 : _e.vScrollBar) || void 0 === _f || _f.release(), 
         null === (_j = null === (_h = null === (_g = this.scenegraph) || void 0 === _g ? void 0 : _g.component) || void 0 === _h ? void 0 : _h.hScrollBar) || void 0 === _j || _j.release(), 
-        this.animationManager.clear(), this.animationManager.ticker.release(), null === (_m = null === (_l = null === (_k = this.scenegraph) || void 0 === _k ? void 0 : _k.stage) || void 0 === _l ? void 0 : _l.ticker) || void 0 === _m || _m.release();
+        this.animationManager.clear(), this.animationManager.ticker.release(), (null === (_k = this.scenegraph) || void 0 === _k ? void 0 : _k.stageOwned) && (null === (_o = null === (_m = null === (_l = this.scenegraph) || void 0 === _l ? void 0 : _l.stage) || void 0 === _m ? void 0 : _m.ticker) || void 0 === _o || _o.release());
         const internalProps = this.internalProps, canvas = null == internalProps ? void 0 : internalProps.canvas;
         (null == canvas ? void 0 : canvas.__vtable__) === this && (delete canvas.__vtable__, 
         delete canvas.__vtable_id__);
         const element = null == internalProps ? void 0 : internalProps.element;
         (null == element ? void 0 : element.__vtable__) === this && (delete element.__vtable__, 
-        delete element.__vtable_id__), this.clearCorrectTimer(), null === (_p = null === (_o = internalProps.tooltipHandler) || void 0 === _o ? void 0 : _o.release) || void 0 === _p || _p.call(_o), 
-        null === (_r = null === (_q = internalProps.menuHandler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), 
-        null === (_s = super.release) || void 0 === _s || _s.call(this), this.pluginManager.release(), 
-        null === (_u = null === (_t = internalProps.handler) || void 0 === _t ? void 0 : _t.release) || void 0 === _u || _u.call(_t), 
-        this.eventManager.release(), null === (_w = null === (_v = internalProps.focusControl) || void 0 === _v ? void 0 : _v.release) || void 0 === _w || _w.call(_v), 
-        null === (_x = internalProps.legends) || void 0 === _x || _x.forEach((legend => {
+        delete element.__vtable_id__), this.clearCorrectTimer(), null === (_q = null === (_p = internalProps.tooltipHandler) || void 0 === _p ? void 0 : _p.release) || void 0 === _q || _q.call(_p), 
+        null === (_s = null === (_r = internalProps.menuHandler) || void 0 === _r ? void 0 : _r.release) || void 0 === _s || _s.call(_r), 
+        null === (_t = super.release) || void 0 === _t || _t.call(this), this.pluginManager.release(), 
+        null === (_v = null === (_u = internalProps.handler) || void 0 === _u ? void 0 : _u.release) || void 0 === _v || _v.call(_u), 
+        this.eventManager.release(), null === (_x = null === (_w = internalProps.focusControl) || void 0 === _w ? void 0 : _w.release) || void 0 === _x || _x.call(_w), 
+        null === (_y = internalProps.legends) || void 0 === _y || _y.forEach((legend => {
             null == legend || legend.release();
-        })), null === (_y = internalProps.title) || void 0 === _y || _y.release(), internalProps.title = null, 
-        null === (_z = internalProps.emptyTip) || void 0 === _z || _z.release(), internalProps.emptyTip = null, 
+        })), null === (_z = internalProps.title) || void 0 === _z || _z.release(), internalProps.title = null, 
+        null === (_0 = internalProps.emptyTip) || void 0 === _0 || _0.release(), internalProps.emptyTip = null, 
         internalProps.layoutMap.release(), internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
             var _a;
             return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
-        })), internalProps.releaseList = null), this.scenegraph.stage.release(), this.scenegraph.proxy.release();
-        const parentElement = null === (_0 = internalProps.element) || void 0 === _0 ? void 0 : _0.parentElement;
+        })), internalProps.releaseList = null), this.scenegraph.releaseStage(), this.scenegraph.proxy.release();
+        const parentElement = null === (_1 = internalProps.element) || void 0 === _1 ? void 0 : _1.parentElement;
         parentElement && !this.options.canvas && parentElement.removeChild(internalProps.element), 
-        null === (_3 = null === (_2 = null === (_1 = this.editorManager) || void 0 === _1 ? void 0 : _1.editingEditor) || void 0 === _2 ? void 0 : _2.onEnd) || void 0 === _3 || _3.call(_2), 
-        this.isReleased = !0, this.scenegraph = null, this.internalProps = null, null === (_4 = this.reactCustomLayout) || void 0 === _4 || _4.clearCache(), 
+        null === (_4 = null === (_3 = null === (_2 = this.editorManager) || void 0 === _2 ? void 0 : _2.editingEditor) || void 0 === _3 ? void 0 : _3.onEnd) || void 0 === _4 || _4.call(_3), 
+        this.isReleased = !0, this.scenegraph = null, this.internalProps = null, null === (_5 = this.reactCustomLayout) || void 0 === _5 || _5.clearCache(), 
         (0, chart_render_helper_1.clearChartRenderQueue)();
     }
     fireListeners(type, event) {
@@ -1078,7 +1082,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         internalProps._rowHeightsMap = new row_height_map_1.NumberRangeMap(this), internalProps._rowRangeHeightsMap = new Map, 
         internalProps._colRangeWidthsMap = new Map), internalProps.stick.changedCells.clear(), 
         internalProps.theme = themes_1.default.of(null !== (_p = options.theme) && void 0 !== _p ? _p : themes_1.default.DEFAULT), 
-        internalProps.theme.isPivot = this.isPivotTable(), (0, icons_1.setIconColor)(internalProps.theme.functionalIconsStyle), 
+        internalProps.theme.isPivot = this.isPivotTable(), this._updateFunctionalIcons(), 
         this.scenegraph.updateStageBackground(), internalProps.autoWrapText = options.autoWrapText, 
         internalProps.enableLineBreak = options.enableLineBreak, internalProps.allowFrozenColCount = null !== (_q = options.allowFrozenColCount) && void 0 !== _q ? _q : 0, 
         internalProps.limitMaxAutoWidth = null !== (_r = options.limitMaxAutoWidth) && void 0 !== _r ? _r : 450, 
@@ -1403,13 +1407,19 @@ class BaseTable extends EventTarget_1.EventTarget {
         this.options.autoWrapText = autoWrapText, this.scenegraph.clearCells(), this.clearCellStyleCache(), 
         this.scenegraph.createSceneGraph(), this.render());
     }
+    _updateFunctionalIcons() {
+        var _a, _b, _c;
+        (0, icons_1.setIconColor)(this.internalProps.theme.functionalIconsStyle), null === (_a = this.internalProps.headerHelper) || void 0 === _a || _a.updateIcons(), 
+        null === (_b = this.internalProps.bodyHelper) || void 0 === _b || _b.updateIcons(), 
+        null === (_c = this.internalProps.rowSeriesNumberHelper) || void 0 === _c || _c.updateIcons();
+    }
     get theme() {
         return this.internalProps.theme;
     }
     set theme(theme) {
         this.internalProps.theme = themes_1.default.of(null != theme ? theme : themes_1.default.DEFAULT), 
         this.internalProps.theme.isPivot = this.isPivotTable(), this.options.theme = theme, 
-        (0, icons_1.setIconColor)(this.internalProps.theme.functionalIconsStyle);
+        this._updateFunctionalIcons();
     }
     updateTheme(theme) {
         const oldHoverState = {
@@ -1417,7 +1427,7 @@ class BaseTable extends EventTarget_1.EventTarget {
             row: this.stateManager.hover.cellPos.row
         };
         this.internalProps.theme = themes_1.default.of(null != theme ? theme : themes_1.default.DEFAULT), 
-        this.internalProps.theme.isPivot = this.isPivotTable(), (0, icons_1.setIconColor)(this.internalProps.theme.functionalIconsStyle), 
+        this.internalProps.theme.isPivot = this.isPivotTable(), this._updateFunctionalIcons(), 
         this.options.theme = theme, this.scenegraph.updateComponent(), this.scenegraph.updateStageBackground(), 
         this.scenegraph.clearCells(), this.clearCellStyleCache(), this.scenegraph.createSceneGraph(), 
         this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.render();
@@ -1432,20 +1442,20 @@ class BaseTable extends EventTarget_1.EventTarget {
     getBodyColumnType(col, row) {
         var _a, _b;
         const cellType = null !== (_b = null === (_a = this.internalProps.layoutMap.getBody(col, row)) || void 0 === _a ? void 0 : _a.cellType) && void 0 !== _b ? _b : "text";
-        return (0, get_prop_1.getProp)("cellType", {
+        return normalizeCellType((0, get_prop_1.getProp)("cellType", {
             cellType: cellType
-        }, col, row, this);
+        }, col, row, this));
     }
     getCellType(col, row) {
         let cellType;
         if (this.isSeriesNumberInHeader(col, row)) {
             const seriesHeaderCellType = this.internalProps.layoutMap.getSeriesNumberHeader(col, row).cellType;
-            return "radio" === seriesHeaderCellType ? "text" : seriesHeaderCellType;
+            return normalizeCellType("radio" === seriesHeaderCellType ? "text" : seriesHeaderCellType);
         }
         return cellType = this.isHeader(col, row) ? this.internalProps.layoutMap.getHeader(col, row).headerType : this.internalProps.layoutMap.getBody(col, row).cellType, 
-        (0, get_prop_1.getProp)("cellType", {
+        normalizeCellType((0, get_prop_1.getProp)("cellType", {
             cellType: cellType
-        }, col, row, this);
+        }, col, row, this));
     }
     getHeaderField(col, row) {
         return this.internalProps.layoutMap.getHeaderField(col, row);