@visactor/vtable 0.26.0-alpha.2 → 1.0.0

package/dist/vtable.js

@@ -23234,8 +23234,12 @@
     function cellInRanges(ranges, col, row) {
         for (let i = 0; i < ranges.length; i++) {
             const range = ranges[i];
-            if ((range.start.col <= col && col <= range.end.col && range.start.row <= row && row <= range.end.row) ||
-                (range.end.col <= col && col <= range.start.col && range.end.row <= row && row <= range.start.row)) {
+            const startCol = Math.min(range.start.col, range.end.col);
+            const endCol = Math.max(range.start.col, range.end.col);
+            const startRow = Math.min(range.start.row, range.end.row);
+            const endRow = Math.max(range.start.row, range.end.row);
+            if ((startCol <= col && col <= endCol && startRow <= row && row <= endRow) ||
+                (endCol <= col && col <= startCol && endRow <= row && row <= startRow)) {
                 return true;
             }
         }
@@ -23294,6 +23298,7 @@
         MOUSEDOWN_CELL: 'mousedown_cell',
         MOUSEUP_CELL: 'mouseup_cell',
         SELECTED_CELL: 'selected_cell',
+        SELECTED_CLEAR: 'selected_clear',
         KEYDOWN: 'keydown',
         MOUSEENTER_TABLE: 'mouseenter_table',
         MOUSELEAVE_TABLE: 'mouseleave_table',
@@ -24692,6 +24697,9 @@
                     get scrollSliderColor() {
                         return scroll.scrollSliderColor ?? '#C0C0C0';
                     },
+                    get scrollSliderCornerRadius() {
+                        return scroll.scrollSliderCornerRadius;
+                    },
                     get scrollRailColor() {
                         return scroll.scrollRailColor;
                     },
@@ -36690,7 +36698,10 @@
     function createImageCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme, isAsync) {
         const headerStyle = table._getCellStyle(col, row);
         const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
-        if (isValid$3(functionalPadding)) {
+        if (table.options.customConfig?.imageMargin) {
+            padding = getQuadProps(table.options.customConfig?.imageMargin);
+        }
+        else if (isValid$3(functionalPadding)) {
             padding = functionalPadding;
         }
         if (cellTheme?.text?.textAlign) {
@@ -36843,7 +36854,13 @@
         const headerStyle = table._getCellStyle(col, row);
         const textAlign = getProp('textAlign', headerStyle, col, row, table) ?? 'left';
         const textBaseline = getProp('textBaseline', headerStyle, col, row, table) ?? 'middle';
-        const padding = getQuadProps(getProp('padding', headerStyle, col, row, table)) ?? [0, 0, 0, 0];
+        let padding;
+        if (table.options.customConfig?.imageMargin) {
+            padding = getQuadProps(table.options.customConfig?.imageMargin);
+        }
+        else {
+            padding = getQuadProps(getProp('padding', headerStyle, col, row, table)) ?? [0, 0, 0, 0];
+        }
         const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
         const colStart = cellGroup.mergeStartCol ?? cellGroup.col;
         const rowStart = cellGroup.mergeStartRow ?? cellGroup.row;
@@ -38122,7 +38139,7 @@
         else {
             text = convertInternal(textStr).replace(/\r?\n/g, '\n').replace(/\r/g, '\n').split('\n') || [];
         }
-        while (text.length && !text[text.length - 1]) {
+        while (text.length && text.length > 1 && !text[text.length - 1]) {
             text.pop();
         }
         return text;
@@ -38492,7 +38509,12 @@
         let contentHeight;
         if (textMark instanceof Text$1) {
             oldTextHeight = textMark.AABBBounds.height();
-            textMark.setAttribute('maxLineWidth', distWidth - leftIconWidth - rightIconHeight - (padding[1] + padding[3]) - (textMark.attribute.dx ?? 0));
+            textMark.setAttribute('maxLineWidth', distWidth -
+                leftIconWidth -
+                rightIconHeight -
+                (padding[1] + padding[3]) -
+                (textMark.attribute.dx ?? 0) -
+                (scene.table.theme._contentOffset ?? 0));
             contentHeight = textMark.AABBBounds.height();
         }
         else if (textMark instanceof RichText) {
@@ -38530,7 +38552,7 @@
         });
         if (autoRowHeight) {
             let newHeight = Math.max(leftIconHeight, contentHeight, rightIconHeight);
-            if (isCellHeightUpdate(scene, cellGroup, newHeight + padding[0] + padding[2], oldCellHeight)) {
+            if (isCellHeightUpdate(scene, cellGroup, Math.round(newHeight + padding[0] + padding[2]), oldCellHeight)) {
                 return true;
             }
             newHeight = (cellGroup.contentHeight ?? cellHeight) - (padding[0] + padding[2]);
@@ -38711,7 +38733,7 @@
                 }
                 icons = table.getCellIcons(iconCol, iconRow);
             }
-            createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, typeof lineClamp === 'number' ? lineClamp : undefined, cellWidth, cellHeight, textAlign, textBaseline, table, cellTheme, range);
+            createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, typeof lineClamp === 'number' ? lineClamp : undefined, cellGroup.attribute.width, cellGroup.attribute.height, textAlign, textBaseline, table, cellTheme, range);
             if (cellTheme?._vtable?.marked) {
                 const mark = createArc({
                     x: cellGroup.attribute.width,
@@ -38739,7 +38761,10 @@
     function createVideoCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme, isAsync) {
         const headerStyle = table._getCellStyle(col, row);
         const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
-        if (isValid$3(functionalPadding)) {
+        if (table.options.customConfig?.imageMargin) {
+            padding = getQuadProps(table.options.customConfig?.imageMargin);
+        }
+        else if (isValid$3(functionalPadding)) {
             padding = functionalPadding;
         }
         if (cellTheme?.text?.textAlign) {
@@ -40869,7 +40894,10 @@
         ignoreBuf: true
     });
     function measureTextBounds(attribute) {
-        utilTextMark.setAttributes(attribute);
+        utilTextMark.initAttributes({
+            ...attribute,
+            ignoreBuf: true
+        });
         return utilTextMark.AABBBounds;
     }
 
@@ -41507,9 +41535,9 @@
             rowStart = row + 1;
             rowEnd = Math.min(scene.proxy.rowEnd, scene.table.rowCount - scene.table.bottomFrozenRowCount - 1);
         }
-        for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
-            for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {
-                const cellGroup = scene.getCell(colIndex, rowIndex);
+        for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {
+            for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
+                const cellGroup = scene.highPerformanceGetCell(colIndex, rowIndex);
                 if (cellGroup.role === 'cell') {
                     cellGroup.setAttribute('y', cellGroup.attribute.y + detaY);
                 }
@@ -42731,7 +42759,20 @@
             const theme = this.table.theme;
             const scrollRailColor = theme.scrollStyle?.scrollRailColor;
             const scrollSliderColor = theme.scrollStyle?.scrollSliderColor;
+            const scrollSliderCornerRadius = theme.scrollStyle?.scrollSliderCornerRadius;
             const width = theme.scrollStyle?.width;
+            let sliderStyle;
+            if (isValid$3(scrollSliderCornerRadius)) {
+                sliderStyle = {
+                    cornerRadius: scrollSliderCornerRadius,
+                    fill: scrollSliderColor
+                };
+            }
+            else {
+                sliderStyle = {
+                    fill: scrollSliderColor
+                };
+            }
             this.hScrollBar = new ScrollBar({
                 direction: 'horizontal',
                 x: -this.table.tableNoFrameWidth * 2,
@@ -42742,9 +42783,7 @@
                 railStyle: {
                     fill: scrollRailColor
                 },
-                sliderStyle: {
-                    fill: scrollSliderColor
-                },
+                sliderStyle,
                 range: [0, 0.1],
                 visible: false
             });
@@ -42760,9 +42799,7 @@
                 railStyle: {
                     fill: scrollRailColor
                 },
-                sliderStyle: {
-                    fill: scrollSliderColor
-                },
+                sliderStyle,
                 range: [0, 0.1],
                 visible: false
             });
@@ -43071,24 +43108,33 @@
             const theme = this.table.theme;
             const scrollRailColor = theme.scrollStyle?.scrollRailColor;
             const scrollSliderColor = theme.scrollStyle?.scrollSliderColor;
+            const scrollSliderCornerRadius = theme.scrollStyle?.scrollSliderCornerRadius;
             const width = theme.scrollStyle?.width;
+            let sliderStyle;
+            if (isValid$3(scrollSliderCornerRadius)) {
+                sliderStyle = {
+                    cornerRadius: scrollSliderCornerRadius,
+                    fill: scrollSliderColor
+                };
+            }
+            else {
+                sliderStyle = {
+                    fill: scrollSliderColor
+                };
+            }
             this.hScrollBar.setAttributes({
                 height: width,
                 railStyle: {
                     fill: scrollRailColor
                 },
-                sliderStyle: {
-                    fill: scrollSliderColor
-                }
+                sliderStyle
             });
             this.vScrollBar.setAttributes({
                 width,
                 railStyle: {
                     fill: scrollRailColor
                 },
-                sliderStyle: {
-                    fill: scrollSliderColor
-                }
+                sliderStyle
             });
             const columnResizeColor = theme.columnResize?.lineColor;
             const columnResizeWidth = theme.columnResize?.lineWidth;
@@ -44050,6 +44096,7 @@
             if (stroke &&
                 Array.isArray(lineDash) &&
                 lineDash.length &&
+                lineDash[0]?.length &&
                 !Array.isArray(strokeArrayColor) &&
                 !Array.isArray(strokeArrayWidth)) {
                 doFillOrStroke.doStroke = false;
@@ -44066,7 +44113,7 @@
         drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
             const { lineDash = groupAttribute.lineDash, stroke = groupAttribute.stroke, strokeArrayColor = groupAttribute.strokeArrayColor, strokeArrayWidth = groupAttribute.strokeArrayWidth, lineWidth = groupAttribute.lineWidth } = group.attribute;
             if (!stroke ||
-                !(Array.isArray(lineDash) && lineDash.length) ||
+                !(Array.isArray(lineDash) && lineDash.length && lineDash[0]?.length) ||
                 Array.isArray(strokeArrayColor) ||
                 Array.isArray(strokeArrayWidth)) {
                 return;
@@ -44888,6 +44935,9 @@
         else if (maxWidth > colMaxWidth) {
             return colMaxWidth;
         }
+        else if (maxWidth <= 0) {
+            maxWidth = table.defaultColWidth;
+        }
         return maxWidth;
     }
     function computeCustomRenderWidth(col, row, table) {
@@ -45228,8 +45278,8 @@
                     y += rangeHeight;
                 }
                 else {
-                    columnGroup.updateColumnHeight(cellGroup.attribute.height);
-                    y += cellGroup.attribute.height;
+                    columnGroup.updateColumnHeight(cellHeight);
+                    y += cellHeight;
                 }
             }
             if (rowLimit && row > rowLimit) {
@@ -46389,14 +46439,18 @@
         constructor(table) {
             this.table = table;
             if (this.table.isPivotChart()) {
-                this.rowLimit = 100;
-                this.colLimit = 100;
+                this.rowLimit = Math.max(100, Math.ceil((table.tableNoFrameHeight * 2) / table.defaultRowHeight));
+                this.colLimit = Math.max(100, Math.ceil((table.tableNoFrameWidth * 2) / table.defaultColWidth));
             }
             else if (this.table.heightMode === 'autoHeight') {
-                this.rowLimit = 100;
+                this.rowLimit = Math.max(100, Math.ceil((table.tableNoFrameHeight * 2) / table.defaultRowHeight));
             }
             else if (this.table.widthMode === 'autoWidth') {
-                this.colLimit = 100;
+                this.colLimit = Math.max(100, Math.ceil((table.tableNoFrameWidth * 2) / table.defaultColWidth));
+            }
+            else {
+                this.rowLimit = Math.max(200, Math.ceil((table.tableNoFrameHeight * 2) / table.defaultRowHeight));
+                this.colLimit = Math.max(100, Math.ceil((table.tableNoFrameWidth * 2) / table.defaultColWidth));
             }
             if (this.table.internalProps.transpose) {
                 this.mode = 'row';
@@ -46813,10 +46867,10 @@
         }
         const prev = cacheCellGroup._prev;
         const next = cacheCellGroup._next;
-        if (cacheCellGroup.row > row && prev && prev.row === row - 1) {
+        if (cacheCellGroup.row > row && prev && prev.row === cacheCellGroup.row - 1) {
             return getCellByCache(prev, row);
         }
-        if (cacheCellGroup.row < row && next && next.row === row + 1) {
+        if (cacheCellGroup.row < row && next && next.row === cacheCellGroup.row + 1) {
             return getCellByCache(next, row);
         }
         return null;
@@ -47126,7 +47180,12 @@
             });
         }
     }
-    function updateCellSelectBorder(scene, newStartCol, newStartRow, newEndCol, newEndRow, ifExtendSelectRange = true) {
+    function updateCellSelectBorder(scene, selectRange, ifExtendSelectRange = true) {
+        const newStartCol = selectRange.start.col;
+        const newStartRow = selectRange.start.row;
+        const newEndCol = selectRange.end.col;
+        const newEndRow = selectRange.end.row;
+        const skipBodyMerge = selectRange.skipBodyMerge;
         let startCol = Math.max(Math.min(newEndCol, newStartCol), 0);
         let startRow = Math.max(Math.min(newEndRow, newStartRow), 0);
         let endCol = Math.min(Math.max(newEndCol, newStartCol), scene.table.colCount - 1);
@@ -47136,6 +47195,9 @@
             for (let col = startCol; col <= endCol; col++) {
                 if (col === startCol) {
                     for (let row = startRow; row <= endRow; row++) {
+                        if (!scene.table.isHeader(col, row) && skipBodyMerge) {
+                            continue;
+                        }
                         const mergeInfo = getCellMergeInfo(scene.table, col, row);
                         if (mergeInfo && mergeInfo.start.col < startCol) {
                             startCol = mergeInfo.start.col;
@@ -47146,6 +47208,9 @@
                 }
                 if (!isExtend && col === endCol) {
                     for (let row = startRow; row <= endRow; row++) {
+                        if (!scene.table.isHeader(col, row) && skipBodyMerge) {
+                            continue;
+                        }
                         const mergeInfo = getCellMergeInfo(scene.table, col, row);
                         if (mergeInfo && Math.min(mergeInfo.end.col, scene.table.colCount - 1) > endCol) {
                             endCol = mergeInfo.end.col;
@@ -47162,6 +47227,9 @@
                 for (let row = startRow; row <= endRow; row++) {
                     if (row === startRow) {
                         for (let col = startCol; col <= endCol; col++) {
+                            if (!scene.table.isHeader(col, row) && skipBodyMerge) {
+                                continue;
+                            }
                             const mergeInfo = getCellMergeInfo(scene.table, col, row);
                             if (mergeInfo && mergeInfo.start.row < startRow) {
                                 startRow = mergeInfo.start.row;
@@ -47172,6 +47240,9 @@
                     }
                     if (!isExtend && row === endRow) {
                         for (let col = startCol; col <= endCol; col++) {
+                            if (!scene.table.isHeader(col, row) && skipBodyMerge) {
+                                continue;
+                            }
                             const mergeInfo = getCellMergeInfo(scene.table, col, row);
                             if (mergeInfo && Math.min(mergeInfo.end.row, scene.table.rowCount - 1) > endRow) {
                                 endRow = mergeInfo.end.row;
@@ -47942,7 +48013,7 @@
         }
         scene.deleteAllSelectBorder();
         scene.table.stateManager.select.ranges.forEach(range => {
-            scene.updateCellSelectBorder(range.start.col, range.start.row, range.end.col, range.end.row);
+            scene.updateCellSelectBorder(range);
         });
         scene.frozenColCount = scene.table.frozenColCount;
         scene.frozenRowCount = scene.colHeaderGroup.firstChild?.childrenCount ?? 0;
@@ -49454,8 +49525,8 @@
         deleteAllSelectBorder() {
             deleteAllSelectBorder(this);
         }
-        updateCellSelectBorder(newStartCol, newStartRow, newEndCol, newEndRow, extendSelectRange = true) {
-            updateCellSelectBorder(this, newStartCol, newStartRow, newEndCol, newEndRow, extendSelectRange);
+        updateCellSelectBorder(selectRange, extendSelectRange = true) {
+            updateCellSelectBorder(this, selectRange, extendSelectRange);
         }
         removeFillHandleFromSelectComponents() {
             removeFillHandleFromSelectComponents(this);
@@ -49463,7 +49534,7 @@
         recreateAllSelectRangeComponents() {
             deleteAllSelectBorder(this);
             this.table.stateManager.select.ranges.forEach((cellRange) => {
-                updateCellSelectBorder(this, cellRange.start.col, cellRange.start.row, cellRange.end.col, cellRange.end.row);
+                updateCellSelectBorder(this, cellRange);
             });
             moveSelectingRangeComponentsToSelectedRangeComponents(this);
         }
@@ -50094,26 +50165,29 @@
         getResizeColAt(abstractX, abstractY, cellGroup, offset = ResizeColumnHotSpotSize / 2) {
             let cell;
             if (!cellGroup) {
-                cell = this.table.getCellAt(abstractX - offset, abstractY);
-            }
-            else {
-                if (abstractX < cellGroup.globalAABBBounds.x1 + offset) {
-                    cell = { col: cellGroup.col - 1, row: cellGroup.row, x: cellGroup.globalAABBBounds.x1 };
-                }
-                else if (cellGroup.globalAABBBounds.x2 - offset < abstractX) {
-                    cell = { col: cellGroup.col, row: cellGroup.row, x: cellGroup.globalAABBBounds.x2 };
-                }
-                if (cell &&
-                    this.table.rightFrozenColCount > 0 &&
-                    cell.col === this.table.colCount - this.table.rightFrozenColCount - 1 &&
-                    this.table.tableNoFrameWidth -
-                        this.table.getFrozenColsWidth() -
-                        this.table.getRightFrozenColsWidth() +
-                        this.table.scrollLeft <
-                        this.bodyGroup.attribute.width) {
-                    cell.col = cell.col + 1;
-                    cell.rightFrozen = true;
+                const drawRange = this.table.getDrawRange();
+                if (abstractY >= drawRange.top && abstractY <= drawRange.bottom) {
+                    cell = this.table.getCellAt(abstractX - offset, abstractY);
+                    return cell;
                 }
+                return { col: -1, row: -1 };
+            }
+            if (abstractX < cellGroup.globalAABBBounds.x1 + offset) {
+                cell = { col: cellGroup.col - 1, row: cellGroup.row, x: cellGroup.globalAABBBounds.x1 };
+            }
+            else if (cellGroup.globalAABBBounds.x2 - offset < abstractX) {
+                cell = { col: cellGroup.col, row: cellGroup.row, x: cellGroup.globalAABBBounds.x2 };
+            }
+            if (cell &&
+                this.table.rightFrozenColCount > 0 &&
+                cell.col === this.table.colCount - this.table.rightFrozenColCount - 1 &&
+                this.table.tableNoFrameWidth -
+                    this.table.getFrozenColsWidth() -
+                    this.table.getRightFrozenColsWidth() +
+                    this.table.scrollLeft <
+                    this.bodyGroup.attribute.width) {
+                cell.col = cell.col + 1;
+                cell.rightFrozen = true;
             }
             if (cell) {
                 return cell;
@@ -50642,7 +50716,7 @@
                 end: { col: table.colCount - 1, row: table.rowCount - 1 }
             });
             const currentRange = state.select.ranges[state.select.ranges.length - 1];
-            scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row, false);
+            scenegraph.updateCellSelectBorder(currentRange, false);
         }
         else if (cellPos.col !== -1 && cellPos.row !== -1 && (col === -1 || row === -1)) {
             cellPos.col = -1;
@@ -50675,7 +50749,7 @@
                     currentRange.end = { col, row };
                 }
                 scenegraph.deleteLastSelectedRangeComponents();
-                scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
+                scenegraph.updateCellSelectBorder(currentRange);
             }
             else {
                 let extendSelectRange = true;
@@ -50687,28 +50761,32 @@
                     const cellRange = table.getCellRange(col, row);
                     state.select.ranges.push({
                         start: { col: cellRange.start.col, row },
-                        end: { col: cellRange.end.col, row: table.rowCount - 1 }
+                        end: { col: cellRange.end.col, row: table.rowCount - 1 },
+                        skipBodyMerge: true
                     });
                 }
                 else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {
                     const cellRange = table.getCellRange(col, row);
                     state.select.ranges.push({
                         start: { col, row: cellRange.start.row },
-                        end: { col: table.colCount - 1, row: cellRange.end.row }
+                        end: { col: table.colCount - 1, row: cellRange.end.row },
+                        skipBodyMerge: true
                     });
                 }
                 else if (table.internalProps.layoutMap.isSeriesNumberInHeader(col, row)) {
                     extendSelectRange = false;
                     state.select.ranges.push({
                         start: { col: 0, row: 0 },
-                        end: { col: table.colCount - 1, row: table.rowCount - 1 }
+                        end: { col: table.colCount - 1, row: table.rowCount - 1 },
+                        skipBodyMerge: true
                     });
                 }
                 else if (table.internalProps.layoutMap.isSeriesNumberInBody(col, row)) {
                     extendSelectRange = false;
                     state.select.ranges.push({
                         start: { col, row: row },
-                        end: { col: table.colCount - 1, row: row }
+                        end: { col: table.colCount - 1, row: row },
+                        skipBodyMerge: true
                     });
                 }
                 else if (col >= 0 && row >= 0) {
@@ -50721,8 +50799,7 @@
                 cellPos.col = col;
                 cellPos.row = row;
                 const currentRange = state.select.ranges?.[state.select.ranges.length - 1];
-                currentRange &&
-                    scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row, extendSelectRange);
+                currentRange && scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
             }
         }
         else if ((interactionState === InteractionState.grabing || table.eventManager.isDraging) &&
@@ -50817,7 +50894,7 @@
                         };
                     }
                 }
-                scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row, extendSelectRange);
+                scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
             }
         }
         scenegraph.updateNextFrame();
@@ -51126,6 +51203,7 @@
                 if (!state.table.transpose &&
                     state.table.internalProps.layoutMap.isSeriesNumberInBody(state.columnMove.colSource, state.columnMove.rowSource)) {
                     state.table.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex);
+                    state.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex);
                 }
                 if (moveContext.moveType === 'column') {
                     clearWidthsAndHeightsCache(colMin, colMax, 0, -1, state.table);
@@ -51538,6 +51616,22 @@
             radio?._handlePointerUp();
         }
     }
+    function changeRadioOrder(sourceIndex, targetIndex, state) {
+        const { radioState, table } = state;
+        if (table.internalProps.transpose) {
+            sourceIndex = table.getRecordShowIndexByCell(sourceIndex, 0);
+            targetIndex = table.getRecordShowIndexByCell(targetIndex, 0);
+        }
+        else {
+            sourceIndex = table.getRecordShowIndexByCell(0, sourceIndex);
+            targetIndex = table.getRecordShowIndexByCell(0, targetIndex);
+        }
+        if (sourceIndex !== targetIndex) {
+            const sourceRecord = radioState[sourceIndex];
+            radioState[sourceIndex] = radioState[targetIndex];
+            radioState[targetIndex] = sourceRecord;
+        }
+    }
 
     function setCheckedState(col, row, field, checked, state) {
         const recordIndex = state.table.getRecordShowIndexByCell(col, row);
@@ -51719,6 +51813,22 @@
             }
         }
     }
+    function changeCheckboxOrder(sourceIndex, targetIndex, state) {
+        const { checkedState, table } = state;
+        if (table.internalProps.transpose) {
+            sourceIndex = table.getRecordShowIndexByCell(sourceIndex, 0);
+            targetIndex = table.getRecordShowIndexByCell(targetIndex, 0);
+        }
+        else {
+            sourceIndex = table.getRecordShowIndexByCell(0, sourceIndex);
+            targetIndex = table.getRecordShowIndexByCell(0, targetIndex);
+        }
+        if (sourceIndex !== targetIndex) {
+            const sourceRecord = checkedState[sourceIndex];
+            checkedState[sourceIndex] = checkedState[targetIndex];
+            checkedState[targetIndex] = sourceRecord;
+        }
+    }
 
     function updateResizeRow(xInTable, yInTable, state) {
         xInTable = Math.ceil(xInTable);
@@ -52204,6 +52314,11 @@
                         row: lastRow
                     });
             }
+            else if (fireListener) {
+                if (this.select.ranges.length === 0) {
+                    this.table.fireListeners(TABLE_EVENT_TYPE.SELECTED_CLEAR, {});
+                }
+            }
         }
         endResizeCol() {
             setTimeout(() => {
@@ -52719,6 +52834,14 @@
         syncRadioState(col, row, field, radioType, indexInCell, isChecked) {
             return syncRadioState(col, row, field, radioType, indexInCell, isChecked, this);
         }
+        changeCheckboxAndRadioOrder(sourceIndex, targetIndex) {
+            if (this.checkedState.length) {
+                changeCheckboxOrder(sourceIndex, targetIndex, this);
+            }
+            if (this.radioState.length) {
+                changeRadioOrder(sourceIndex, targetIndex, this);
+            }
+        }
     }
 
     function bindMediaClick(table) {
@@ -52916,6 +53039,7 @@
                 row: targetCell.row,
                 event: e,
                 targetCell,
+                mergeInfo: getMergeCellInfo(targetCell),
                 target: e.target
             };
         }
@@ -52930,6 +53054,20 @@
         }
         return null;
     }
+    function getMergeCellInfo(cellGroup) {
+        if (isValid$3(cellGroup.mergeStartCol) &&
+            isValid$3(cellGroup.mergeStartRow) &&
+            isValid$3(cellGroup.mergeEndCol) &&
+            isValid$3(cellGroup.mergeEndRow)) {
+            return {
+                colStart: cellGroup.mergeStartCol,
+                colEnd: cellGroup.mergeEndCol,
+                rowStart: cellGroup.mergeStartRow,
+                rowEnd: cellGroup.mergeEndRow
+            };
+        }
+        return undefined;
+    }
     const regIndexReg = /radio-\d+-\d+-(\d+)/;
 
     function bindTableGroupListener(eventManager) {
@@ -52998,7 +53136,8 @@
                         }),
                         scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
                         event: e.nativeEvent,
-                        target: eventArgsSet?.eventArgs?.target
+                        target: eventArgsSet?.eventArgs?.target,
+                        mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
                     });
                 }
             }
@@ -53027,7 +53166,8 @@
                             funcType: icon.attribute.funcType
                         }
                         : undefined,
-                    target: eventArgsSet?.eventArgs?.target
+                    target: eventArgsSet?.eventArgs?.target,
+                    mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
                 });
             }
         });
@@ -53245,7 +53385,8 @@
                         col: eventArgsSet.eventArgs.col,
                         row: eventArgsSet.eventArgs.row,
                         event: e.nativeEvent,
-                        target: eventArgsSet?.eventArgs?.target
+                        target: eventArgsSet?.eventArgs?.target,
+                        mergeCellInfo: eventArgsSet.eventArgs.mergeInfo
                     });
                 }
             }
@@ -53290,7 +53431,8 @@
                             col: eventArgsSet.eventArgs.target.col,
                             row: eventArgsSet.eventArgs.target.row,
                             scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
-                            target: eventArgsSet?.eventArgs?.target
+                            target: eventArgsSet?.eventArgs?.target,
+                            mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
                         };
                         cellsEvent.cells = table.getSelectedCellInfos();
                         table.fireListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END, cellsEvent);
@@ -53307,7 +53449,8 @@
                         col: eventArgsSet.eventArgs.col,
                         row: eventArgsSet.eventArgs.row,
                         event: e.nativeEvent,
-                        target: eventArgsSet?.eventArgs?.target
+                        target: eventArgsSet?.eventArgs?.target,
+                        mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
                     });
                 }
             }
@@ -53339,7 +53482,8 @@
                                 funcType: icon.attribute.funcType
                             }
                             : undefined,
-                        target: eventArgsSet?.eventArgs?.target
+                        target: eventArgsSet?.eventArgs?.target,
+                        mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
                     };
                     if (cellInRanges(table.stateManager.select.ranges, col, row)) {
                         cellsEvent.cells = table.getSelectedCellInfos();
@@ -53395,7 +53539,8 @@
                             funcType: icon.attribute.funcType
                         }
                         : undefined,
-                    target: eventArgsSet?.eventArgs?.target
+                    target: eventArgsSet?.eventArgs?.target,
+                    mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
                 };
                 table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
             }
@@ -53440,6 +53585,7 @@
                 stateManager.updateInteractionState(InteractionState.default);
                 eventManager.dealTableHover();
                 eventManager.dealTableSelect();
+                stateManager.endSelectCells();
                 stateManager.updateCursor();
                 table.scenegraph.updateChartState(null);
             }
@@ -53493,6 +53639,7 @@
                 ...cellInfo,
                 event: e.nativeEvent,
                 target: eventArgsSet?.eventArgs?.target,
+                mergeCellInfo: eventArgsSet?.eventArgs?.mergeInfo,
                 checked: e.detail.checked
             };
             if (table.isHeader(col, row)) {
@@ -53582,6 +53729,7 @@
                 ...cellInfo,
                 event: e.nativeEvent,
                 target: eventArgsSet?.eventArgs?.target,
+                mergeCellInfo: eventArgsSet?.eventArgs?.mergeInfo,
                 radioIndexInCell
             };
             table.fireListeners(TABLE_EVENT_TYPE.RADIO_STATE_CHANGE, cellsEvent);
@@ -53652,7 +53800,8 @@
                         funcType: icon.attribute.funcType
                     }
                     : undefined,
-                target: eventArgsSet?.eventArgs?.target
+                target: eventArgsSet?.eventArgs?.target,
+                mergeCellInfo: eventArgsSet?.eventArgs?.mergeInfo
             };
             table.fireListeners(TABLE_EVENT_TYPE.DBLCLICK_CELL, cellsEvent);
         }
@@ -53686,6 +53835,11 @@
         });
         scenegraph.component.vScrollBar.addEventListener('pointerdown', (e) => {
             e.stopPropagation();
+            if (scenegraph.table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
+                scenegraph.table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
+                    event: e.nativeEvent
+                });
+            }
         });
         scenegraph.component.vScrollBar.addEventListener('scrollDown', (e) => {
             scenegraph.table.eventManager.LastBodyPointerXY = { x: e.x, y: e.y };
@@ -53723,6 +53877,11 @@
         });
         scenegraph.component.hScrollBar.addEventListener('pointerdown', (e) => {
             e.stopPropagation();
+            if (scenegraph.table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
+                scenegraph.table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
+                    event: e.nativeEvent
+                });
+            }
         });
         scenegraph.component.hScrollBar.addEventListener('scrollDown', (e) => {
             scenegraph.table.eventManager.LastBodyPointerXY = { x: e.x, y: e.y };
@@ -56234,6 +56393,19 @@
                     return CheckboxStyle;
             }
         }
+        setTableColumnsEditor() {
+            const setEditor = (colDefines, setColumns) => {
+                colDefines?.forEach((colDefine, index) => {
+                    if (colDefine.editor) {
+                        setColumns[index].editor = colDefine.editor;
+                    }
+                    if (colDefine.columns) {
+                        setEditor(colDefine.columns, setColumns[index].columns);
+                    }
+                });
+            };
+            setEditor(this._table.options.columns, this._table.internalProps.columns);
+        }
     }
 
     class BaseTooltip {
@@ -58269,7 +58441,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.26.0-alpha.2";
+        version = "1.0.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -58692,8 +58864,21 @@
             let heightP = 0;
             if (Env.mode === 'browser') {
                 const element = this.getElement();
-                const width1 = element.parentElement?.offsetWidth ?? 1 - 1;
-                const height1 = element.parentElement?.offsetHeight ?? 1 - 1;
+                let widthWithoutPadding = 0;
+                let heightWithoutPadding = 0;
+                if (element.parentElement) {
+                    const computedStyle = element.parentElement.style || window.getComputedStyle(element.parentElement);
+                    widthWithoutPadding =
+                        element.parentElement.offsetWidth -
+                            parseInt(computedStyle.paddingLeft || '0px', 10) -
+                            parseInt(computedStyle.paddingRight || '0px', 10);
+                    heightWithoutPadding =
+                        element.parentElement.offsetHeight -
+                            parseInt(computedStyle.paddingTop || '0px', 10) -
+                            parseInt(computedStyle.paddingBottom || '0px', 20);
+                }
+                const width1 = widthWithoutPadding ?? 1 - 1;
+                const height1 = heightWithoutPadding ?? 1 - 1;
                 element.style.width = (width1 && `${width1 - padding.left - padding.right}px`) || '0px';
                 element.style.height = (height1 && `${height1 - padding.top - padding.bottom}px`) || '0px';
                 const { canvas } = this.internalProps;
@@ -58769,6 +58954,24 @@
         }
         getRowHeight(row) {
             if (isValid$3(this.rowHeightsMap.get(row))) {
+                if (this.options.customConfig?._disableColumnAndRowSizeRound) {
+                    const height = this.rowHeightsMap.get(row);
+                    let heightRange;
+                    if (row < this.frozenRowCount) {
+                        heightRange = this.rowHeightsMap.getSumInRange(0, row);
+                    }
+                    else if (row >= this.rowCount - this.bottomFrozenRowCount) {
+                        heightRange = this.rowHeightsMap.getSumInRange(row, this.rowCount - 1);
+                    }
+                    else {
+                        heightRange = this.rowHeightsMap.getSumInRange(this.frozenRowCount, row);
+                    }
+                    heightRange = Number(heightRange.toFixed(2));
+                    if (Number.isInteger(heightRange)) {
+                        return Math.ceil(height);
+                    }
+                    return Math.floor(height);
+                }
                 return this.rowHeightsMap.get(row);
             }
             const defaultHeight = this.getDefaultRowHeight(row);
@@ -58807,7 +59010,7 @@
             return this.internalProps.defaultRowHeight;
         }
         _setRowHeight(row, height, clearCache) {
-            this.rowHeightsMap.put(row, Math.round(height));
+            this.rowHeightsMap.put(row, this.options.customConfig?._disableColumnAndRowSizeRound ? height : Math.round(height));
             if (clearCache) {
                 this._clearRowRangeHeightsMap(row);
             }
@@ -58839,6 +59042,24 @@
                 }
             }
             else {
+                if (this.options.customConfig?._disableColumnAndRowSizeRound) {
+                    const tempH = this.rowHeightsMap.getSumInRange(startRow, endRow);
+                    let heightRange;
+                    if (endRow < this.frozenRowCount) {
+                        heightRange = this.rowHeightsMap.getSumInRange(0, endRow);
+                    }
+                    else if (endRow >= this.rowCount - this.bottomFrozenRowCount) {
+                        heightRange = this.rowHeightsMap.getSumInRange(endRow, this.rowCount - 1);
+                    }
+                    else {
+                        heightRange = this.rowHeightsMap.getSumInRange(this.frozenRowCount, endRow);
+                    }
+                    heightRange = Number(heightRange.toFixed(2));
+                    if (Number.isInteger(heightRange)) {
+                        return Math.ceil(tempH);
+                    }
+                    return Math.floor(tempH);
+                }
                 h = this.rowHeightsMap.getSumInRange(startRow, endRow);
             }
             return Math.round(h);
@@ -60758,7 +60979,7 @@
             const c = this.scenegraph.stage.toCanvas();
             return c.toDataURL();
         }
-        exportCellImg(col, row) {
+        exportCellImg(col, row, options) {
             const isInView = this.cellIsInVisualView(col, row);
             const { scrollTop, scrollLeft } = this;
             if (!isInView) {
@@ -60772,16 +60993,43 @@
             this.stateManager.updateHoverPos(-1, -1);
             this.scenegraph.component.hideVerticalScrollBar();
             this.scenegraph.component.hideHorizontalScrollBar();
+            this.scenegraph.tableGroup.border.setAttribute('visible', false);
+            let oldFill;
+            if (options?.disableBackground) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                oldFill = cellGroup.attribute.fill;
+                cellGroup.setAttribute('fill', 'transparent');
+            }
+            let oldStroke;
+            if (options?.disableBorder) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                oldStroke = cellGroup.attribute.stroke;
+                cellGroup.setAttribute('stroke', false);
+            }
             this.scenegraph.renderSceneGraph();
-            const c = this.scenegraph.stage.toCanvas(false, new AABBBounds().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
+            let sizeOffset = 0;
+            if (this.theme.cellBorderClipDirection === 'bottom-right') {
+                sizeOffset = 1;
+            }
+            const c = this.scenegraph.stage.toCanvas(false, new AABBBounds().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX - sizeOffset, cellRect.bottom + this.tableY - sizeOffset));
             if (!isInView) {
                 this.setScrollTop(scrollTop);
                 this.setScrollLeft(scrollLeft);
             }
+            this.scenegraph.tableGroup.border.setAttribute('visible', true);
+            if (oldFill) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                cellGroup.setAttribute('fill', oldFill);
+            }
+            if (oldStroke) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                cellGroup.setAttribute('stroke', oldStroke);
+            }
             if (this.stateManager.select?.ranges?.length > 0) {
                 restoreCellSelectBorder(this.scenegraph);
             }
             this.stateManager.updateHoverPos(hoverCol, hoverRow);
+            this.scenegraph.updateNextFrame();
             return c.toDataURL();
         }
         exportCellRangeImg(cellRange) {
@@ -61874,37 +62122,17 @@
     function parseColKeyRowKeyForPivotTable(table, options) {
         let columnDimensionTree;
         let rowDimensionTree;
-        let isNeedResetColumnDimensionTree = true;
-        let isNeedResetRowDimensionTree = true;
         if (options.columnTree) {
             if (table.options.indicatorsAsCol !== false && table.options.supplementIndicatorNodes !== false) {
-                supplementIndicatorNodesForCustomTree(table.internalProps.columnTree, options.indicators);
+                table.internalProps.columnTree = supplementIndicatorNodesForCustomTree(table.internalProps.columnTree, options.indicators);
             }
             columnDimensionTree = new DimensionTree(table.internalProps.columnTree ?? [], table.layoutNodeId);
-            if (table.options.supplementIndicatorNodes !== false &&
-                table.options.indicatorsAsCol !== false &&
-                !columnDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&
-                options.indicators?.length >= 1) {
-                isNeedResetColumnDimensionTree = true;
-            }
-            else {
-                isNeedResetColumnDimensionTree = false;
-            }
         }
         if (options.rowTree) {
             if (table.options.indicatorsAsCol === false && table.options.supplementIndicatorNodes !== false) {
-                supplementIndicatorNodesForCustomTree(table.internalProps.rowTree, options.indicators);
+                table.internalProps.rowTree = supplementIndicatorNodesForCustomTree(table.internalProps.rowTree, options.indicators);
             }
             rowDimensionTree = new DimensionTree(table.internalProps.rowTree ?? [], table.layoutNodeId, table.options.rowHierarchyType, table.options.rowHierarchyType === 'tree' ? table.options.rowExpandLevel ?? 1 : undefined);
-            if (table.options.supplementIndicatorNodes !== false &&
-                table.options.indicatorsAsCol === false &&
-                !rowDimensionTree.dimensionKeys.contain(IndicatorDimensionKeyPlaceholder) &&
-                options.indicators?.length >= 1) {
-                isNeedResetRowDimensionTree = true;
-            }
-            else {
-                isNeedResetRowDimensionTree = false;
-            }
         }
         const rowKeys = rowDimensionTree?.dimensionKeys?.count
             ? rowDimensionTree.dimensionKeys.valueArr()
@@ -61984,8 +62212,6 @@
             rowKeys,
             columnKeys,
             indicatorKeys,
-            isNeedResetColumnDimensionTree,
-            isNeedResetRowDimensionTree,
             columnDimensionTree,
             rowDimensionTree
         };
@@ -63505,13 +63731,6 @@
         startEditCell(col, row) {
             const editor = this.table.getEditor(col, row);
             if (editor) {
-                if (!this.table.isHeader(col, row)) {
-                    const range = this.table.getCellRange(col, row);
-                    const isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;
-                    if (isMerge) {
-                        return;
-                    }
-                }
                 if (this.table.internalProps.layoutMap?.isAggregation?.(col, row)) {
                     return;
                 }
@@ -63559,7 +63778,16 @@
             if (!this.editingEditor.getValue) ;
             if (!this.editingEditor.validateValue || this.editingEditor.validateValue?.()) {
                 const changedValue = this.editingEditor.getValue?.();
-                this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
+                const range = this.table.getCellRange(this.editCell.col, this.editCell.row);
+                const changedValues = [];
+                for (let row = range.start.row; row <= range.end.row; row++) {
+                    const rowChangedValues = [];
+                    for (let col = range.start.col; col <= range.end.col; col++) {
+                        rowChangedValues.push(changedValue);
+                    }
+                    changedValues.push(rowChangedValues);
+                }
+                this.table.changeCellValues(range.start.col, range.start.row, changedValues);
                 this.editingEditor.exit && (void 0);
                 this.editingEditor.exit?.();
                 this.editingEditor.onEnd?.();
@@ -63603,11 +63831,7 @@
                 : options.header
                     ? cloneDeepSpec(options.header)
                     : [];
-            options.columns?.forEach((colDefine, index) => {
-                if (colDefine.editor) {
-                    internalProps.columns[index].editor = colDefine.editor;
-                }
-            });
+            this.internalProps.headerHelper.setTableColumnsEditor();
             this.showHeader = options.showHeader ?? true;
             this.transpose = options.transpose ?? false;
             if (Env.mode !== 'node') {
@@ -63652,11 +63876,7 @@
         updateColumns(columns) {
             const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
             this.internalProps.columns = cloneDeepSpec(columns);
-            columns.forEach((colDefine, index) => {
-                if (colDefine.editor) {
-                    this.internalProps.columns[index].editor = colDefine.editor;
-                }
-            });
+            this.internalProps.headerHelper.setTableColumnsEditor();
             this.options.columns = columns;
             this.refreshHeader();
             this.scenegraph.clearCells();
@@ -63823,9 +64043,13 @@
             if (ifCan) {
                 if (!this.transpose) {
                     const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
+                    const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
                     if (cellDefine?.disableColumnResize) {
                         return false;
                     }
+                    else if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
+                        return false;
+                    }
                 }
             }
             return ifCan;
@@ -63843,11 +64067,7 @@
                 : options.header
                     ? cloneDeepSpec(options.header)
                     : [];
-            options.columns.forEach((colDefine, index) => {
-                if (colDefine.editor) {
-                    internalProps.columns[index].editor = colDefine.editor;
-                }
-            });
+            this.internalProps.headerHelper.setTableColumnsEditor();
             this.transpose = options.transpose ?? false;
             this.refreshHeader();
             if (internalProps.releaseList) {
@@ -64918,6 +65138,10 @@
         cornerHeaderObjs;
         columnHeaderObjs = [];
         rowHeaderObjs = [];
+        _cornerHeaderCellFullPathIds = [];
+        _columnHeaderCellFullPathIds = [];
+        _rowHeaderCellFullPathIds = [];
+        _rowHeaderCellFullPathIds_FULL = [];
         _cornerHeaderCellIds = [];
         _columnHeaderCellIds = [];
         _rowHeaderCellIds = [];
@@ -65041,7 +65265,7 @@
                 });
             }
             this.resetColumnHeaderLevelCount();
-            this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
+            this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
             if (table.options.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
                 this.generateExtensionRowTree();
                 this.extensionRows.forEach(extensionRow => {
@@ -65097,6 +65321,7 @@
             else {
                 this._indicatorShowType = 'none';
             }
+            this.generateCellIdsConsiderHideHeader();
             this.setPagination(table.options.pagination);
             if (this._table.isPivotChart()) {
                 this._chartItemSpanSize = 0;
@@ -65181,13 +65406,13 @@
         }
         _generateColHeaderIds() {
             if (this.columnDimensionTree.tree.children?.length >= 1) {
-                this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
+                this._addHeaders(this._columnHeaderCellFullPathIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
             }
             if (this.columnHeaderTitle) {
                 this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
                 const id = ++this.sharedVar.seqId;
                 const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
-                this._columnHeaderCellIds.unshift(firstRowIds);
+                this._columnHeaderCellFullPathIds.unshift(firstRowIds);
                 const cell = {
                     id,
                     title: typeof this.columnHeaderTitle.title === 'string'
@@ -65214,17 +65439,17 @@
         _generateRowHeaderIds() {
             if (this.rowDimensionTree.tree.children?.length >= 1) {
                 if (this.rowHierarchyType === 'tree') {
-                    this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
+                    this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
                 }
                 else {
-                    this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
+                    this._addHeaders(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
                 }
             }
             if (this.rowHeaderTitle) {
                 this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
                 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 firstColIds = Array(this._rowHeaderCellFullPathIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
+                this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
                 const cell = {
                     id,
                     title: typeof this.rowHeaderTitle.title === 'string'
@@ -65326,19 +65551,19 @@
                     results[id] = cell;
                     this._headerObjects[id] = cell;
                     if (this.cornerSetting.titleOnDimension === 'column') {
-                        if (!this._cornerHeaderCellIds[key]) {
-                            this._cornerHeaderCellIds[key] = [];
+                        if (!this._cornerHeaderCellFullPathIds[key]) {
+                            this._cornerHeaderCellFullPathIds[key] = [];
                         }
                         for (let r = 0; r < this.rowHeaderLevelCount; r++) {
-                            this._cornerHeaderCellIds[key][r] = id;
+                            this._cornerHeaderCellFullPathIds[key][r] = id;
                         }
                     }
                     else if (this.cornerSetting.titleOnDimension === 'row') {
                         for (let r = 0; r < this.columnHeaderLevelCount; r++) {
-                            if (!this._cornerHeaderCellIds[r]) {
-                                this._cornerHeaderCellIds[r] = [];
+                            if (!this._cornerHeaderCellFullPathIds[r]) {
+                                this._cornerHeaderCellFullPathIds[r] = [];
                             }
-                            this._cornerHeaderCellIds[r][key] = id;
+                            this._cornerHeaderCellFullPathIds[r][key] = id;
                         }
                     }
                 });
@@ -65363,10 +65588,10 @@
                 this._headerObjects[id] = cell;
                 for (let r = 0; r < this.columnHeaderLevelCount; r++) {
                     for (let j = 0; j < this.rowHeaderLevelCount; j++) {
-                        if (!this._cornerHeaderCellIds[r]) {
-                            this._cornerHeaderCellIds[r] = [];
+                        if (!this._cornerHeaderCellFullPathIds[r]) {
+                            this._cornerHeaderCellFullPathIds[r] = [];
                         }
-                        this._cornerHeaderCellIds[r][j] = id;
+                        this._cornerHeaderCellFullPathIds[r][j] = id;
                     }
                 }
             }
@@ -65374,8 +65599,8 @@
         }
         generateExtensionRowTree() {
             this.extensionRows.forEach((extensionRow, indexP) => {
-                const old_rowHeaderCellIds = this._rowHeaderCellIds_FULL;
-                this._rowHeaderCellIds_FULL = [];
+                const old_rowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL;
+                this._rowHeaderCellFullPathIds_FULL = [];
                 old_rowHeaderCellIds.forEach((row_ids, index) => {
                     const key = row_ids[row_ids.length - 1];
                     this.colIndex = 0;
@@ -65401,7 +65626,7 @@
                     const extensionRowTreeHeaderIds = [];
                     this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, true, extensionRow.rows, this.rowHeaderObjs);
                     for (let i = 0; i < extensionRowTreeHeaderIds[0].length; i++) {
-                        this._rowHeaderCellIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
+                        this._rowHeaderCellFullPathIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
                     }
                 });
             });
@@ -65741,7 +65966,7 @@
                 this.columnHeaderLevelCount = count;
                 return;
             }
-            this.columnHeaderLevelCount = 0;
+            this.columnHeaderLevelCount = !this.indicatorsAsCol ? 0 : this.hideIndicatorName ? 0 : 1;
             return;
         }
         resetRowHeaderLevelCount() {
@@ -66118,7 +66343,7 @@
             }
             if (col >= 0 && recordRow >= 0) {
                 if (this.rowHierarchyType === 'tree') {
-                    const row_pathIds = this._rowHeaderCellIds[recordRow];
+                    const row_pathIds = this._rowHeaderCellFullPathIds[recordRow];
                     let findTree = this.rowDimensionTree;
                     let level = 0;
                     while (findTree) {
@@ -66240,7 +66465,7 @@
             return this.isColumnIndicatorHeader(col, row) || this.isRowIndicatorHeader(col, row);
         }
         toggleHierarchyState(col, row) {
-            const oldRowHeaderCellIds = this._rowHeaderCellIds_FULL.slice(0);
+            const oldRowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL.slice(0);
             const oldRowHeaderCellPositons = oldRowHeaderCellIds.map((id, row) => {
                 return { col, row: row + this.columnHeaderLevelCount };
             });
@@ -66248,15 +66473,15 @@
             hd.define.hierarchyState =
                 hd.define.hierarchyState === HierarchyState.collapse ? HierarchyState.expand : HierarchyState.collapse;
             this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
-            this._rowHeaderCellIds_FULL = [];
+            this._rowHeaderCellFullPathIds_FULL = [];
             this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr();
             this.fullRowDimensionKeys = [];
             this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
-            this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
+            this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
             if (this.rowHeaderTitle) {
                 const id = ++this.sharedVar.seqId;
                 const firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
-                this._rowHeaderCellIds_FULL.unshift(firstColIds);
+                this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
                 const cell = {
                     id,
                     title: typeof this.rowHeaderTitle.title === 'string'
@@ -66281,7 +66506,7 @@
                 this.rowHeaderObjs.push(cell);
                 this._headerObjects[id] = cell;
             }
-            this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
+            this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
             if (this.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
                 this.generateExtensionRowTree();
             }
@@ -66292,8 +66517,9 @@
             }, {});
             this._CellHeaderPathMap = new Map();
             this._largeCellRangeCache.length = 0;
-            const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this._rowHeaderCellIds_FULL.map(newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount]), oldRowHeaderCellPositons, this);
-            this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice();
+            const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this._rowHeaderCellFullPathIds_FULL.map(newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount]), oldRowHeaderCellPositons, this);
+            this.generateCellIdsConsiderHideHeader();
+            this.setPagination(this.pagination);
             return diffCell;
         }
         isHeaderForColWidth(col, row) {
@@ -66516,10 +66742,10 @@
                     if (targetIndex === sourceCellRange.start.col) {
                         return null;
                     }
-                    for (let row = 0; row < this._columnHeaderCellIds.length; row++) {
-                        const sourceIds = this._columnHeaderCellIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
+                    for (let row = 0; row < this._columnHeaderCellFullPathIds.length; row++) {
+                        const sourceIds = this._columnHeaderCellFullPathIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
                         sourceIds.unshift(targetIndex - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, 0);
-                        Array.prototype.splice.apply(this._columnHeaderCellIds[row], sourceIds);
+                        Array.prototype.splice.apply(this._columnHeaderCellFullPathIds[row], sourceIds);
                     }
                     const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
                     sourceColumns.unshift((targetIndex - this.leftRowSeriesNumberColumnCount), 0);
@@ -66556,9 +66782,15 @@
                     const sourceIds = this._rowHeaderCellIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
                     sourceIds.unshift((targetIndex - this.currentPageStartIndex), 0);
                     Array.prototype.splice.apply(this._rowHeaderCellIds, sourceIds);
+                    const sourceIds0 = this._rowHeaderCellFullPathIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
+                    sourceIds0.unshift((targetIndex - this.currentPageStartIndex), 0);
+                    Array.prototype.splice.apply(this._rowHeaderCellFullPathIds, sourceIds0);
                     const sourceIds_FULL = this._rowHeaderCellIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
                     sourceIds_FULL.unshift(targetIndex, 0);
                     Array.prototype.splice.apply(this._rowHeaderCellIds_FULL, sourceIds_FULL);
+                    const sourceIds_FULL0 = this._rowHeaderCellFullPathIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
+                    sourceIds_FULL0.unshift(targetIndex, 0);
+                    Array.prototype.splice.apply(this._rowHeaderCellFullPathIds_FULL, sourceIds_FULL0);
                     this.rowDimensionTree.movePosition(sourceRowHeaderPaths.length - 1, sourceCellRange.start.row - this.columnHeaderLevelCount, targetIndex + (target.row > source.row ? sourceRowHeaderNode.size - 1 : 0));
                     this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
                     this._CellHeaderPathMap = new Map();
@@ -66834,11 +67066,13 @@
                 this.currentPageStartIndex = perPageCount * (currentPage || 0);
                 this.currentPageEndIndex = this.currentPageStartIndex + perPageCount;
                 this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
+                this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
             }
             else {
                 this.currentPageStartIndex = 0;
                 this.currentPageEndIndex = this._rowHeaderCellIds_FULL.length;
                 this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
+                this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
             }
             this.pagination && (this.pagination.totalCount = this._rowHeaderCellIds_FULL?.length);
         }
@@ -67222,7 +67456,7 @@
             return totalCount;
         }
         resetHeaderTree() {
-            this._rowHeaderCellIds_FULL = [];
+            this._rowHeaderCellFullPathIds_FULL = [];
             this._columnHeaderCellIds = [];
             const dataset = this.dataset;
             this.rowTree = dataset.rowHeaderTree;
@@ -67233,11 +67467,12 @@
             this.colIndex = 0;
             this._generateRowHeaderIds();
             this.resetColumnHeaderLevelCount();
-            this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
+            this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
             this._headerObjectMap = this._headerObjects.reduce((o, e) => {
                 o[e.id] = e;
                 return o;
             }, {});
+            this.generateCellIdsConsiderHideHeader();
             this.setPagination(this.pagination);
         }
         isSeriesNumberInHeader(col, row) {
@@ -67315,6 +67550,75 @@
             const id = this.getCellId(col, row);
             this._headerObjectMap[id].title = value;
         }
+        generateCellIdsConsiderHideHeader() {
+            this._columnHeaderCellIds = this._columnHeaderCellFullPathIds.slice();
+            if (!this.showColumnHeader) {
+                if (this.indicatorsAsCol && !this.hideIndicatorName) {
+                    const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
+                    const indicatorIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
+                    this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
+                    this._columnHeaderCellIds.push(indicatorIds[0]);
+                }
+                else {
+                    this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
+                }
+            }
+            this._rowHeaderCellIds_FULL = this._rowHeaderCellFullPathIds_FULL.slice();
+            if (!this.showRowHeader) {
+                if (!this.indicatorsAsCol && !this.hideIndicatorName) {
+                    const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
+                    this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
+                        const _cellIds = cellIds.slice();
+                        const indicator = _cellIds.splice(indicatorIndex, 1);
+                        _cellIds.splice(0, _cellIds.length);
+                        _cellIds.push(indicator[0]);
+                        this._rowHeaderCellIds_FULL[index] = _cellIds;
+                    });
+                }
+                else {
+                    this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
+                        const _cellIds = cellIds.slice();
+                        _cellIds.splice(0, _cellIds.length);
+                        this._rowHeaderCellIds_FULL[index] = _cellIds;
+                    });
+                }
+            }
+            this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice();
+            this._cornerHeaderCellIds = this._cornerHeaderCellFullPathIds.slice();
+            if (this.rowHeaderLevelCount === 0 || this.columnHeaderLevelCount === 0) {
+                this._cornerHeaderCellIds = [];
+            }
+            else if (this.cornerSetting.titleOnDimension === 'row' && !this.showRowHeader) {
+                if (!this.indicatorsAsCol && !this.hideIndicatorName) {
+                    const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
+                    this._cornerHeaderCellIds.forEach((cellIds, index) => {
+                        const _cellIds = cellIds.slice();
+                        const indicator = _cellIds.splice(indicatorIndex, 1);
+                        _cellIds.splice(0, _cellIds.length);
+                        _cellIds.push(indicator[0]);
+                        this._cornerHeaderCellIds[index] = _cellIds;
+                    });
+                }
+                else {
+                    this._cornerHeaderCellIds.forEach((cellIds, index) => {
+                        const _cellIds = cellIds.slice();
+                        _cellIds.splice(0, _cellIds.length);
+                        this._cornerHeaderCellIds[index] = _cellIds;
+                    });
+                }
+            }
+            else if (this.cornerSetting.titleOnDimension === 'column' && !this.showColumnHeader) {
+                if (this.indicatorsAsCol && !this.hideIndicatorName) {
+                    const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
+                    const indicatorIds = this._cornerHeaderCellIds.splice(indicatorIndex, 1);
+                    this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
+                    this._cornerHeaderCellIds.push(indicatorIds[0]);
+                }
+                else {
+                    this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
+                }
+            }
+        }
     }
     function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
         if (paddingInner === 1) {
@@ -68751,13 +69055,19 @@
                 }
                 else {
                     const keysResults = parseColKeyRowKeyForPivotTable(this, options);
-                    const { rowKeys, columnKeys, indicatorKeys, isNeedResetColumnDimensionTree, isNeedResetRowDimensionTree } = keysResults;
+                    const { rowKeys, columnKeys, indicatorKeys } = keysResults;
                     let { columnDimensionTree, rowDimensionTree } = keysResults;
                     this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
-                    if (!options.columnTree || isNeedResetColumnDimensionTree) {
+                    if (!options.columnTree) {
+                        if (options.indicatorsAsCol !== false) {
+                            this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators);
+                        }
                         columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
                     }
-                    if (!options.rowTree || isNeedResetRowDimensionTree) {
+                    if (!options.rowTree) {
+                        if (options.indicatorsAsCol === false) {
+                            this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators);
+                        }
                         rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
                     }
                     this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -68799,7 +69109,11 @@
         _canResizeColumn(col, row) {
             const ifCan = super._canResizeColumn(col, row);
             if (ifCan) {
-                if (!this.internalProps.layoutMap.indicatorsAsCol) {
+                const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
+                if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
+                    return false;
+                }
+                else if (!this.internalProps.layoutMap.indicatorsAsCol) {
                     const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
                     if (cellDefine?.disableColumnResize) {
                         return false;
@@ -68869,13 +69183,19 @@
             }
             else {
                 const keysResults = parseColKeyRowKeyForPivotTable(this, options);
-                const { rowKeys, columnKeys, indicatorKeys, isNeedResetColumnDimensionTree, isNeedResetRowDimensionTree } = keysResults;
+                const { rowKeys, columnKeys, indicatorKeys } = keysResults;
                 let { columnDimensionTree, rowDimensionTree } = keysResults;
                 this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
-                if (!options.columnTree || isNeedResetColumnDimensionTree) {
+                if (!options.columnTree) {
+                    if (options.indicatorsAsCol !== false) {
+                        this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators);
+                    }
                     columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
                 }
-                if (!options.rowTree || isNeedResetRowDimensionTree) {
+                if (!options.rowTree) {
+                    if (options.indicatorsAsCol === false) {
+                        this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators);
+                    }
                     rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
                 }
                 internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -69796,13 +70116,13 @@
             let rowDimensionTree;
             if (options.columnTree) {
                 if (options.indicatorsAsCol !== false) {
-                    supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators);
+                    this.internalProps.columnTree = supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators);
                 }
                 columnDimensionTree = new DimensionTree(this.internalProps.columnTree ?? [], this.layoutNodeId);
             }
             if (options.rowTree) {
                 if (options.indicatorsAsCol === false) {
-                    supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators);
+                    this.internalProps.rowTree = supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators);
                 }
                 rowDimensionTree = new DimensionTree(this.internalProps.rowTree ?? [], this.layoutNodeId);
             }
@@ -69869,6 +70189,16 @@
                     ];
                 }
             }
+            if (!options.columnTree) {
+                if (options.indicatorsAsCol !== false) {
+                    this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators);
+                }
+            }
+            if (!options.rowTree) {
+                if (options.indicatorsAsCol === false) {
+                    this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators);
+                }
+            }
             columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
             rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId);
             this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -69934,13 +70264,13 @@
             let rowDimensionTree;
             if (options.columnTree) {
                 if (options.indicatorsAsCol !== false) {
-                    supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators);
+                    this.internalProps.columnTree = supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators);
                 }
                 columnDimensionTree = new DimensionTree(this.internalProps.columnTree ?? [], this.layoutNodeId);
             }
             if (options.rowTree) {
                 if (options.indicatorsAsCol === false) {
-                    supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators);
+                    this.internalProps.rowTree = supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators);
                 }
                 rowDimensionTree = new DimensionTree(this.internalProps.rowTree ?? [], this.layoutNodeId);
             }
@@ -70007,6 +70337,16 @@
                     ];
                 }
             }
+            if (!options.columnTree) {
+                if (options.indicatorsAsCol !== false) {
+                    this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators);
+                }
+            }
+            if (!options.rowTree) {
+                if (options.indicatorsAsCol === false) {
+                    this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators);
+                }
+            }
             columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
             rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId);
             internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -71307,7 +71647,7 @@
     }
 
     registerForVrender();
-    const version = "0.26.0-alpha.2";
+    const version = "1.0.0";
     function getIcons() {
         return get$2();
     }