@visactor/vtable 0.15.5-alpha.1 → 0.15.5-alpha.2

package/dist/vtable.js

@@ -35325,6 +35325,9 @@
             this.setAttribute('width', (this.attribute.width ?? 0) + deltaX);
             if (this.border) {
                 this.border.setAttribute('width', this.border.attribute.width + deltaX);
+                if (this.border.type === 'group') {
+                    this.border.firstChild.setAttribute('width', this.border.firstChild.attribute.width + deltaX);
+                }
             }
         }
         setDeltaHeight(deltaY) {
@@ -35334,6 +35337,9 @@
             this.setAttribute('height', (this.attribute.height ?? 0) + deltaY);
             if (this.border) {
                 this.border.setAttribute('height', this.border.attribute.height + deltaY);
+                if (this.border.type === 'group') {
+                    this.border.firstChild.setAttribute('width', this.border.firstChild.attribute.height + deltaY);
+                }
             }
         }
         setDeltaX(deltaX) {
@@ -35451,6 +35457,9 @@
         }
     };
     function after(group, selfChange) {
+        if (!group.stage.dirtyBounds) {
+            return;
+        }
         if (!(group.stage && group.stage.renderCount)) {
             return;
         }
@@ -38887,8 +38896,14 @@
                 table._clearRowRangeHeightsMap();
             }
             for (let row = rowStart; row < table.columnHeaderLevelCount; row++) {
+                let startCol = 0;
+                let endCol = table.colCount - 1;
+                if ((table.isPivotTable() || table.isPivotChart()) && checkPivotFixedStyleAndNoWrap(table, row)) {
+                    startCol = 0;
+                    endCol = table.rowHeaderLevelCount;
+                }
                 if (isAllRowsAuto || table.getDefaultRowHeight(row) === 'auto') {
-                    const height = computeRowHeight(row, 0, table.colCount - 1, table);
+                    const height = computeRowHeight(row, startCol, endCol, table);
                     if (update) {
                         newHeights[row] = height;
                     }
@@ -39108,6 +39123,7 @@
             if (typeof cellDefine.style === 'function' ||
                 typeof cellDefine.icon === 'function' ||
                 cellDefine.define?.customRender ||
+                cellDefine.define?.customLayout ||
                 typeof cellDefine.define?.icon === 'function') {
                 return false;
             }
@@ -39131,6 +39147,7 @@
         if (typeof cellDefine.style === 'function' ||
             typeof cellDefine.icon === 'function' ||
             cellDefine.define?.customRender ||
+            cellDefine.define?.customLayout ||
             typeof cellDefine.define?.icon === 'function') {
             return false;
         }
@@ -39143,6 +39160,29 @@
         }
         return true;
     }
+    function checkPivotFixedStyleAndNoWrap(table, row) {
+        const { layoutMap } = table.internalProps;
+        if (table.internalProps.autoWrapText &&
+            (table.options.heightMode === 'autoHeight' || table.options.heightMode === 'adaptive')) {
+            return false;
+        }
+        const headerDefine = layoutMap.getHeader(table.rowHeaderLevelCount, row);
+        if (typeof headerDefine.style === 'function' ||
+            typeof headerDefine.icons === 'function' ||
+            headerDefine.define?.headerCustomRender ||
+            headerDefine.define?.headerCustomLayout ||
+            typeof headerDefine.define?.icon === 'function') {
+            return false;
+        }
+        const headerStyle = table._getCellStyle(table.rowHeaderLevelCount, row);
+        if (typeof headerStyle.padding === 'function' ||
+            typeof headerStyle.fontSize === 'function' ||
+            typeof headerStyle.lineHeight === 'function' ||
+            headerStyle.autoWrapText === true) {
+            return false;
+        }
+        return true;
+    }
     function fillRowsHeight(height, startRow, endRow, table, newHeights) {
         for (let row = startRow; row <= endRow; row++) {
             if (newHeights) {
@@ -40624,6 +40664,7 @@
         }
         const isTableGroup = role === 'table';
         const { shadowBlur, shadowOffsetX, shadowOffsetY, shadowColor, cornerRadius, borderColor, borderLineWidth, borderLineDash } = frameTheme;
+        let hasShadow = false;
         const groupAttributes = {};
         const rectAttributes = {
             pickable: false
@@ -40636,8 +40677,7 @@
             rectAttributes.stroke = true;
             rectAttributes.stroke = shadowColor;
             rectAttributes.lineWidth = 1;
-            rectAttributes.fill = true;
-            rectAttributes.fillOpacity = 0.01;
+            hasShadow = true;
         }
         if (borderLineWidth) {
             rectAttributes.stroke = true;
@@ -40679,12 +40719,32 @@
             rectAttributes.y = borderTop / 2;
             rectAttributes.pickable = false;
             if (isTableGroup) {
-                rectAttributes.x = group.attribute.x - borderLeft / 2;
-                rectAttributes.y = group.attribute.y - borderTop / 2;
+                rectAttributes.x = -borderLeft / 2;
+                rectAttributes.y = -borderTop / 2;
                 rectAttributes.width = group.attribute.width + borderLeft / 2 + borderRight / 2;
                 rectAttributes.height = group.attribute.height + borderTop / 2 + borderBottom / 2;
-                const borderRect = createRect(rectAttributes);
-                borderRect.name = 'table-border-rect';
+                let shadowRect;
+                let borderRect;
+                if (hasShadow) {
+                    rectAttributes.fill = 'white';
+                    rectAttributes.notAdjustPos = true;
+                    shadowRect = createRect(rectAttributes);
+                    borderRect = createGroup({
+                        x: group.attribute.x,
+                        y: group.attribute.y,
+                        width: group.attribute.width,
+                        height: group.attribute.height,
+                        fill: 'red',
+                        cornerRadius: group.attribute.cornerRadius,
+                        globalCompositeOperation: 'destination-out'
+                    });
+                    borderRect.name = 'table-border-rect';
+                    borderRect.addChild(shadowRect);
+                }
+                else {
+                    borderRect = createRect(rectAttributes);
+                    borderRect.name = 'table-border-rect';
+                }
                 group.parent.insertBefore(borderRect, group);
                 group.border = borderRect;
             }
@@ -40743,6 +40803,12 @@
             width: group.attribute.width - borderLeft / 2 - borderRight / 2,
             height: group.attribute.height - borderTop / 2 - borderBottom / 2
         });
+        if (group.border.type === 'group') {
+            group.border.firstChild.setAttributes({
+                width: group.attribute.width,
+                height: group.attribute.height
+            });
+        }
     }
 
     /*! *****************************************************************************
@@ -41369,8 +41435,9 @@
         useStyle = true;
         order = 0;
         drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
-            const { lineWidth = groupAttribute.lineWidth, stroke = groupAttribute.stroke, lineDash = groupAttribute.lineDash, strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor = groupAttribute.strokeArrayColor } = group.attribute;
-            if (stroke &&
+            const { lineWidth = groupAttribute.lineWidth, stroke = groupAttribute.stroke, lineDash = groupAttribute.lineDash, strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor = groupAttribute.strokeArrayColor, notAdjustPos } = group.attribute;
+            if (notAdjustPos !== true &&
+                stroke &&
                 Array.isArray(lineDash) &&
                 !lineDash.length &&
                 !Array.isArray(strokeArrayColor) &&
@@ -41388,9 +41455,10 @@
         useStyle = true;
         order = 0;
         drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
-            const { lineWidth = groupAttribute.lineWidth, stroke = groupAttribute.stroke, lineDash = groupAttribute.lineDash, strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor = groupAttribute.strokeArrayColor } = group.attribute;
+            const { lineWidth = groupAttribute.lineWidth, stroke = groupAttribute.stroke, lineDash = groupAttribute.lineDash, strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor = groupAttribute.strokeArrayColor, notAdjustPos } = group.attribute;
             const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;
-            if (stroke &&
+            if (notAdjustPos !== true &&
+                stroke &&
                 Array.isArray(lineDash) &&
                 !lineDash.length &&
                 !Array.isArray(strokeArrayColor) &&
@@ -51798,7 +51866,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.15.5-alpha.1";
+        version = "0.15.5-alpha.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -52833,6 +52901,7 @@
                 internalProps.releaseList = null;
             }
             this.scenegraph.stage.release();
+            this.scenegraph.proxy.release();
             const { parentElement } = internalProps.element;
             if (parentElement) {
                 parentElement.removeChild(internalProps.element);
@@ -54358,8 +54427,8 @@
         };
     }
 
-    let seqId = 0;
     class SimpleHeaderLayoutMap {
+        seqId = 0;
         _headerObjects;
         _headerObjectMap;
         _headerCellIds;
@@ -54867,7 +54936,7 @@
             const rowCells = this._newRow(row, hideColumnsSubHeader);
             column.forEach((hd) => {
                 const col = this._columns.length;
-                const id = seqId++;
+                const id = this.seqId++;
                 const cell = {
                     id,
                     title: hd.title ?? hd.caption,
@@ -54897,7 +54966,7 @@
                 else {
                     const colDef = hd;
                     this._columns.push({
-                        id: seqId++,
+                        id: this.seqId++,
                         field: colDef.field,
                         fieldKey: colDef.fieldKey,
                         fieldFormat: colDef.fieldFormat,
@@ -56016,6 +56085,7 @@
     }
 
     class DimensionTree {
+        sharedVar;
         sizeIncludeParent = false;
         rowExpandLevel;
         hierarchyType;
@@ -56032,10 +56102,11 @@
         };
         totalLevel = 0;
         dimensionKeys = new NumberMap();
-        constructor(tree, hierarchyType = 'grid', rowExpandLevel = undefined) {
+        constructor(tree, sharedVar, hierarchyType = 'grid', rowExpandLevel = undefined) {
             this.sizeIncludeParent = rowExpandLevel !== null && rowExpandLevel !== undefined;
             this.rowExpandLevel = rowExpandLevel;
             this.hierarchyType = hierarchyType;
+            this.sharedVar = sharedVar;
             this.reset(tree);
         }
         reset(tree, updateTreeNode = false) {
@@ -56051,7 +56122,7 @@
                 !this.dimensionKeys.contain(node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey) &&
                     this.dimensionKeys.put(node.level, node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey);
                 if (!node.id) {
-                    node.id = ++sharedVar.seqId;
+                    node.id = ++this.sharedVar.seqId;
                 }
             }
             let size = node.dimensionKey ? (this.sizeIncludeParent ? 1 : 0) : 0;
@@ -56211,11 +56282,158 @@
         });
         return count;
     }
+    function dealHeader(hd, _headerCellIds, results, roots, row, layoutMap) {
+        const id = hd.id;
+        const dimensionInfo = layoutMap.rowsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey) ??
+            layoutMap.columnsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
+        const indicatorInfo = layoutMap.indicatorsDefine?.find(indicator => {
+            if (typeof indicator === 'string') {
+                return false;
+            }
+            if (hd.indicatorKey) {
+                return indicator.indicatorKey === hd.indicatorKey;
+            }
+            return indicator.title === hd.value;
+        });
+        const cell = {
+            id,
+            title: hd.value ?? indicatorInfo?.title,
+            field: hd.dimensionKey,
+            style: typeof (indicatorInfo ?? dimensionInfo)?.headerStyle === 'function'
+                ? (indicatorInfo ?? dimensionInfo)?.headerStyle
+                : Object.assign({}, (indicatorInfo ?? dimensionInfo)?.headerStyle),
+            headerType: indicatorInfo?.headerType ?? dimensionInfo?.headerType ?? 'text',
+            headerIcon: indicatorInfo?.headerIcon ?? dimensionInfo?.headerIcon,
+            define: Object.assign({}, hd, indicatorInfo ?? dimensionInfo),
+            fieldFormat: indicatorInfo?.headerFormat ?? dimensionInfo?.headerFormat,
+            dropDownMenu: indicatorInfo?.dropDownMenu ?? dimensionInfo?.dropDownMenu,
+            pivotInfo: {
+                value: hd.value,
+                dimensionKey: hd.dimensionKey,
+                isPivotCorner: false
+            },
+            width: dimensionInfo?.width,
+            minWidth: dimensionInfo?.minWidth,
+            maxWidth: dimensionInfo?.maxWidth,
+            showSort: indicatorInfo?.showSort ?? dimensionInfo?.showSort,
+            description: dimensionInfo?.description
+        };
+        if (indicatorInfo) {
+            if (indicatorInfo.customRender) {
+                hd.customRender = indicatorInfo.customRender;
+            }
+            if (!isValid$5(layoutMap._indicators?.find(indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) {
+                layoutMap._indicators?.push({
+                    id: ++layoutMap.sharedVar.seqId,
+                    indicatorKey: indicatorInfo.indicatorKey,
+                    field: indicatorInfo.indicatorKey,
+                    fieldFormat: indicatorInfo?.format,
+                    cellType: indicatorInfo?.cellType ?? indicatorInfo?.columnType ?? 'text',
+                    chartModule: 'chartModule' in indicatorInfo ? indicatorInfo.chartModule : null,
+                    chartSpec: 'chartSpec' in indicatorInfo ? indicatorInfo.chartSpec : null,
+                    sparklineSpec: 'sparklineSpec' in indicatorInfo ? indicatorInfo.sparklineSpec : null,
+                    style: indicatorInfo?.style,
+                    icon: indicatorInfo?.icon,
+                    define: Object.assign({}, hd, indicatorInfo, {
+                        dragHeader: dimensionInfo?.dragHeader
+                    }),
+                    width: indicatorInfo?.width,
+                    minWidth: indicatorInfo?.minWidth,
+                    maxWidth: indicatorInfo?.maxWidth,
+                    disableColumnResize: indicatorInfo?.disableColumnResize
+                });
+            }
+        }
+        else if (hd.indicatorKey) {
+            if (!isValid$5(layoutMap._indicators?.find(indicator => indicator.indicatorKey === hd.indicatorKey))) {
+                layoutMap._indicators?.push({
+                    id: ++layoutMap.sharedVar.seqId,
+                    indicatorKey: hd.indicatorKey,
+                    field: hd.indicatorKey,
+                    cellType: 'text',
+                    define: Object.assign({}, hd)
+                });
+            }
+        }
+        results[id] = cell;
+        layoutMap._headerObjects[id] = cell;
+        _headerCellIds[row][layoutMap.colIndex] = id;
+        for (let r = row - 1; r >= 0; r--) {
+            _headerCellIds[r][layoutMap.colIndex] = roots[r];
+        }
+        if (hd.children?.length >= 1) {
+            layoutMap
+                ._addHeaders(_headerCellIds, row + 1, hd.children ?? [], [...roots, id])
+                .forEach(c => results.push(c));
+        }
+        else {
+            for (let r = row + 1; r < _headerCellIds.length; r++) {
+                _headerCellIds[r][layoutMap.colIndex] = id;
+            }
+            layoutMap.colIndex++;
+        }
+    }
+    function dealHeaderForTreeMode(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, layoutMap) {
+        const id = hd.id;
+        const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
+        const cell = {
+            id,
+            title: hd.value,
+            field: hd.dimensionKey,
+            style: hd.level + 1 === totalLevel || typeof dimensionInfo?.headerStyle === 'function'
+                ? dimensionInfo?.headerStyle
+                : Object.assign({}, dimensionInfo?.headerStyle, { textAlign: 'left' }),
+            headerType: dimensionInfo?.headerType ?? 'text',
+            headerIcon: dimensionInfo?.headerIcon,
+            define: Object.assign(hd, {
+                linkJump: dimensionInfo?.linkJump,
+                linkDetect: dimensionInfo?.linkDetect,
+                templateLink: dimensionInfo?.templateLink,
+                keepAspectRatio: dimensionInfo?.keepAspectRatio ?? false,
+                imageAutoSizing: dimensionInfo?.imageAutoSizing,
+                headerCustomRender: dimensionInfo?.headerCustomRender,
+                headerCustomLayout: dimensionInfo?.headerCustomLayout,
+                dragHeader: dimensionInfo?.dragHeader
+            }),
+            fieldFormat: dimensionInfo?.headerFormat,
+            dropDownMenu: dimensionInfo?.dropDownMenu,
+            pivotInfo: {
+                value: hd.value,
+                dimensionKey: hd.dimensionKey,
+                isPivotCorner: false
+            },
+            hierarchyLevel: hd.level,
+            dimensionTotalLevel: totalLevel,
+            hierarchyState: hd.level + 1 === totalLevel ? undefined : hd.hierarchyState,
+            width: dimensionInfo?.width,
+            minWidth: dimensionInfo?.minWidth,
+            maxWidth: dimensionInfo?.maxWidth,
+            parentCellId: roots[roots.length - 1]
+        };
+        results[id] = cell;
+        layoutMap._headerObjects[id] = cell;
+        _headerCellIds[row][layoutMap.colIndex] = id;
+        for (let r = row - 1; r >= 0; r--) {
+            _headerCellIds[r][layoutMap.colIndex] = roots[r];
+        }
+        if (hd.hierarchyState === HierarchyState.expand && hd.children?.length >= 1) {
+            show && layoutMap.colIndex++;
+            layoutMap
+                ._addHeadersForTreeMode(_headerCellIds, row, hd.children ?? [], [...roots, id], totalLevel, show && hd.hierarchyState === HierarchyState.expand, dimensions)
+                .forEach(c => results.push(c));
+        }
+        else {
+            show && layoutMap.colIndex++;
+            for (let r = row + 1; r < _headerCellIds.length; r++) {
+                _headerCellIds[r][layoutMap.colIndex] = id;
+            }
+        }
+    }
 
-    const sharedVar = { seqId: 0 };
-    let colIndex = 0;
     const defaultDimension = { startInTotal: 0, level: 0 };
     class PivotHeaderLayoutMap {
+        sharedVar;
+        colIndex = 0;
         _showHeader = true;
         rowDimensionTree;
         columnDimensionTree;
@@ -56271,6 +56489,7 @@
         _chartItemBandSize;
         _chartPadding;
         constructor(table, dataset) {
+            this.sharedVar = { seqId: 0 };
             this._table = table;
             if (table.options.rowHierarchyType === 'tree') {
                 this.extensionRows = table.options.extensionRows;
@@ -56333,8 +56552,8 @@
                     this.indicatorKeys.push(indicator.indicatorKey);
                 }
             });
-            this.columnDimensionTree = new DimensionTree(this.columnTree ?? []);
-            this.rowDimensionTree = new DimensionTree(this.rowTree ?? [], this.rowHierarchyType, this.rowHierarchyType === 'tree' ? this.rowExpandLevel : undefined);
+            this.columnDimensionTree = new DimensionTree(this.columnTree ?? [], this.sharedVar);
+            this.rowDimensionTree = new DimensionTree(this.rowTree ?? [], this.sharedVar, this.rowHierarchyType, this.rowHierarchyType === 'tree' ? this.rowExpandLevel : undefined);
             this.colDimensionKeys = this.columnDimensionTree.dimensionKeys.valueArr();
             this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr();
             this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
@@ -56343,7 +56562,7 @@
                 this.columnHeaderObjs = this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, []);
             }
             if (this.columnHeaderTitle) {
-                const id = ++sharedVar.seqId;
+                const id = ++this.sharedVar.seqId;
                 const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
                 this._columnHeaderCellIds.unshift(firstRowIds);
                 const cell = {
@@ -56366,7 +56585,7 @@
                 this.columnHeaderObjs.push(cell);
                 this._headerObjects[id] = cell;
             }
-            colIndex = 0;
+            this.colIndex = 0;
             if (this.rowDimensionTree.tree.children?.length >= 1) {
                 this.rowHeaderObjs =
                     this.rowHierarchyType === 'tree'
@@ -56374,7 +56593,7 @@
                         : this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, []);
             }
             if (this.rowHeaderTitle) {
-                const id = ++sharedVar.seqId;
+                const id = ++this.sharedVar.seqId;
                 const firstColIds = Array(this._rowHeaderCellIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
                 this._rowHeaderCellIds_FULL.unshift(firstColIds);
                 const cell = {
@@ -56447,7 +56666,7 @@
             else {
                 this.cornerHeaderObjs = this._addCornerHeaders(null, undefined);
             }
-            colIndex = 0;
+            this.colIndex = 0;
             this._headerObjectMap = this._headerObjects.reduce((o, e) => {
                 o[e.id] = e;
                 return o;
@@ -56500,9 +56719,10 @@
             this.setColumnWidths();
         }
         _addHeaders(_headerCellIds, row, header, roots) {
+            const _this = this;
             function _newRow(row) {
                 const newRow = (_headerCellIds[row] = []);
-                if (colIndex === 0) {
+                if (_this.colIndex === 0) {
                     return newRow;
                 }
                 const prev = _headerCellIds[row - 1];
@@ -56515,101 +56735,17 @@
             if (!_headerCellIds[row]) {
                 _newRow(row);
             }
-            header.forEach(hd => {
-                const id = hd.id;
-                const dimensionInfo = this.rowsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey) ??
-                    this.columnsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
-                const indicatorInfo = this.indicatorsDefine?.find(indicator => {
-                    if (typeof indicator === 'string') {
-                        return false;
-                    }
-                    if (hd.indicatorKey) {
-                        return indicator.indicatorKey === hd.indicatorKey;
-                    }
-                    return indicator.title === hd.value;
-                });
-                const cell = {
-                    id,
-                    title: hd.value ?? indicatorInfo?.title,
-                    field: hd.dimensionKey,
-                    style: typeof (indicatorInfo ?? dimensionInfo)?.headerStyle === 'function'
-                        ? (indicatorInfo ?? dimensionInfo)?.headerStyle
-                        : Object.assign({}, (indicatorInfo ?? dimensionInfo)?.headerStyle),
-                    headerType: indicatorInfo?.headerType ?? dimensionInfo?.headerType ?? 'text',
-                    headerIcon: indicatorInfo?.headerIcon ?? dimensionInfo?.headerIcon,
-                    define: Object.assign({}, hd, indicatorInfo ?? dimensionInfo),
-                    fieldFormat: indicatorInfo?.headerFormat ?? dimensionInfo?.headerFormat,
-                    dropDownMenu: indicatorInfo?.dropDownMenu ?? dimensionInfo?.dropDownMenu,
-                    pivotInfo: {
-                        value: hd.value,
-                        dimensionKey: hd.dimensionKey,
-                        isPivotCorner: false
-                    },
-                    width: dimensionInfo?.width,
-                    minWidth: dimensionInfo?.minWidth,
-                    maxWidth: dimensionInfo?.maxWidth,
-                    showSort: indicatorInfo?.showSort ?? dimensionInfo?.showSort,
-                    description: dimensionInfo?.description
-                };
-                if (indicatorInfo) {
-                    if (indicatorInfo.customRender) {
-                        hd.customRender = indicatorInfo.customRender;
-                    }
-                    if (!isValid$5(this._indicators?.find(indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) {
-                        this._indicators?.push({
-                            id: ++sharedVar.seqId,
-                            indicatorKey: indicatorInfo.indicatorKey,
-                            field: indicatorInfo.indicatorKey,
-                            fieldFormat: indicatorInfo?.format,
-                            cellType: indicatorInfo?.cellType ?? indicatorInfo?.columnType ?? 'text',
-                            chartModule: 'chartModule' in indicatorInfo ? indicatorInfo.chartModule : null,
-                            chartSpec: 'chartSpec' in indicatorInfo ? indicatorInfo.chartSpec : null,
-                            sparklineSpec: 'sparklineSpec' in indicatorInfo ? indicatorInfo.sparklineSpec : null,
-                            style: indicatorInfo?.style,
-                            icon: indicatorInfo?.icon,
-                            define: Object.assign({}, hd, indicatorInfo, {
-                                dragHeader: dimensionInfo?.dragHeader
-                            }),
-                            width: indicatorInfo?.width,
-                            minWidth: indicatorInfo?.minWidth,
-                            maxWidth: indicatorInfo?.maxWidth,
-                            disableColumnResize: indicatorInfo?.disableColumnResize
-                        });
-                    }
-                }
-                else if (hd.indicatorKey) {
-                    if (!isValid$5(this._indicators?.find(indicator => indicator.indicatorKey === hd.indicatorKey))) {
-                        this._indicators?.push({
-                            id: ++sharedVar.seqId,
-                            indicatorKey: hd.indicatorKey,
-                            field: hd.indicatorKey,
-                            cellType: 'text',
-                            define: Object.assign({}, hd)
-                        });
-                    }
-                }
-                results[id] = cell;
-                this._headerObjects[id] = cell;
-                _headerCellIds[row][colIndex] = id;
-                for (let r = row - 1; r >= 0; r--) {
-                    _headerCellIds[r][colIndex] = roots[r];
-                }
-                if (hd.children?.length >= 1) {
-                    this._addHeaders(_headerCellIds, row + 1, hd.children ?? [], [...roots, id]).forEach(c => results.push(c));
-                }
-                else {
-                    for (let r = row + 1; r < _headerCellIds.length; r++) {
-                        _headerCellIds[r][colIndex] = id;
-                    }
-                    colIndex++;
-                }
-            });
+            for (let i = 0; i < header.length; i++) {
+                const hd = header[i];
+                dealHeader(hd, _headerCellIds, results, roots, row, this);
+            }
             return results;
         }
         _addHeadersForTreeMode(_headerCellIds, row, header, roots, totalLevel, show, dimensions) {
+            const _this = this;
             function _newRow(row) {
                 const newRow = (_headerCellIds[row] = []);
-                if (colIndex === 0) {
+                if (_this.colIndex === 0) {
                     return newRow;
                 }
                 const prev = _headerCellIds[row - 1];
@@ -56622,67 +56758,17 @@
             if (!_headerCellIds[row]) {
                 _newRow(row);
             }
-            header.forEach(hd => {
-                const id = hd.id;
-                const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
-                const cell = {
-                    id,
-                    title: hd.value,
-                    field: hd.dimensionKey,
-                    style: hd.level + 1 === totalLevel || typeof dimensionInfo?.headerStyle === 'function'
-                        ? dimensionInfo?.headerStyle
-                        : Object.assign({}, dimensionInfo?.headerStyle, { textAlign: 'left' }),
-                    headerType: dimensionInfo?.headerType ?? 'text',
-                    headerIcon: dimensionInfo?.headerIcon,
-                    define: Object.assign(hd, {
-                        linkJump: dimensionInfo?.linkJump,
-                        linkDetect: dimensionInfo?.linkDetect,
-                        templateLink: dimensionInfo?.templateLink,
-                        keepAspectRatio: dimensionInfo?.keepAspectRatio ?? false,
-                        imageAutoSizing: dimensionInfo?.imageAutoSizing,
-                        headerCustomRender: dimensionInfo?.headerCustomRender,
-                        headerCustomLayout: dimensionInfo?.headerCustomLayout,
-                        dragHeader: dimensionInfo?.dragHeader
-                    }),
-                    fieldFormat: dimensionInfo?.headerFormat,
-                    dropDownMenu: dimensionInfo?.dropDownMenu,
-                    pivotInfo: {
-                        value: hd.value,
-                        dimensionKey: hd.dimensionKey,
-                        isPivotCorner: false
-                    },
-                    hierarchyLevel: hd.level,
-                    dimensionTotalLevel: totalLevel,
-                    hierarchyState: hd.level + 1 === totalLevel ? undefined : hd.hierarchyState,
-                    width: dimensionInfo?.width,
-                    minWidth: dimensionInfo?.minWidth,
-                    maxWidth: dimensionInfo?.maxWidth,
-                    parentCellId: roots[roots.length - 1]
-                };
-                results[id] = cell;
-                this._headerObjects[id] = cell;
-                _headerCellIds[row][colIndex] = id;
-                for (let r = row - 1; r >= 0; r--) {
-                    _headerCellIds[r][colIndex] = roots[r];
-                }
-                if (hd.hierarchyState === HierarchyState.expand && hd.children?.length >= 1) {
-                    show && colIndex++;
-                    this._addHeadersForTreeMode(_headerCellIds, row, hd.children ?? [], [...roots, id], totalLevel, show && hd.hierarchyState === HierarchyState.expand, dimensions).forEach(c => results.push(c));
-                }
-                else {
-                    show && colIndex++;
-                    for (let r = row + 1; r < _headerCellIds.length; r++) {
-                        _headerCellIds[r][colIndex] = id;
-                    }
-                }
-            });
+            for (let i = 0; i < header.length; i++) {
+                const hd = header[i];
+                dealHeaderForTreeMode(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, this);
+            }
             return results;
         }
         _addCornerHeaders(dimensionKeys, dimensions) {
             const results = [];
             if (dimensionKeys) {
                 dimensionKeys.forEach((dimensionKey, key) => {
-                    const id = ++sharedVar.seqId;
+                    const id = ++this.sharedVar.seqId;
                     const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === dimensionKey);
                     const cell = {
                         id,
@@ -56730,7 +56816,7 @@
                 });
             }
             else {
-                const id = ++sharedVar.seqId;
+                const id = ++this.sharedVar.seqId;
                 const cell = {
                     id,
                     title: '',
@@ -56762,7 +56848,7 @@
                 this._rowHeaderCellIds_FULL = [];
                 old_rowHeaderCellIds.forEach((row_ids, index) => {
                     const key = row_ids[row_ids.length - 1];
-                    colIndex = 0;
+                    this.colIndex = 0;
                     let tree;
                     if (typeof extensionRow.rowTree === 'function') {
                         const fullCellIds = this.findFullCellIds(row_ids);
@@ -56779,7 +56865,7 @@
                         rowExtensionDimensionTree = this._rowHeaderExtensionTree[key];
                     }
                     else {
-                        rowExtensionDimensionTree = new DimensionTree(tree ?? [], this.rowHierarchyType, undefined);
+                        rowExtensionDimensionTree = new DimensionTree(tree ?? [], this.sharedVar, this.rowHierarchyType, undefined);
                         this._rowHeaderExtensionTree[key] = rowExtensionDimensionTree;
                     }
                     const extensionRowTreeHeaderIds = [];
@@ -57519,7 +57605,7 @@
             this._rowHeaderCellIds_FULL = [];
             this.rowHeaderObjs = this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine);
             if (this.rowHeaderTitle) {
-                const id = ++sharedVar.seqId;
+                const id = ++this.sharedVar.seqId;
                 const firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
                 this._rowHeaderCellIds_FULL.unshift(firstColIds);
                 const cell = {
@@ -57548,7 +57634,7 @@
             if (this.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
                 this.generateExtensionRowTree();
             }
-            colIndex = 0;
+            this.colIndex = 0;
             this._headerObjectMap = this._headerObjects.reduce((o, e) => {
                 o[e.id] = e;
                 return o;
@@ -61959,7 +62045,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.15.5-alpha.1";
+    const version = "0.15.5-alpha.2";
     function getIcons() {
         return get$2();
     }