@visactor/vtable 0.19.0 → 0.19.1

package/dist/vtable.js

@@ -30606,14 +30606,18 @@
             this.type = option.type ?? 'band';
             this.option = merge({}, getCommonAxis(option.__vtableChartTheme), getTableAxisTheme(this.orient, table.theme), getChartSpecAxisTheme(this.orient, this.type, option.__vtableChartTheme), option);
             if (this.orient === 'left' || this.orient === 'right') {
+                const innerOffsetTop = this.option.innerOffset?.top ?? 0;
+                const innerOffsetBottom = this.option.innerOffset?.bottom ?? 0;
                 this.width = width;
-                this.height = height - padding[2];
-                this.y = padding[0];
+                this.height = height - padding[2] - innerOffsetBottom;
+                this.y = padding[0] + innerOffsetTop;
             }
             else if (this.orient === 'top' || this.orient === 'bottom') {
-                this.width = width - padding[1];
+                const innerOffsetLeft = this.option.innerOffset?.left ?? 0;
+                const innerOffsetRight = this.option.innerOffset?.right ?? 0;
+                this.width = width - padding[1] - innerOffsetRight;
                 this.height = height;
-                this.x = padding[3];
+                this.x = padding[3] + innerOffsetLeft;
             }
             this.visible = option.visible ?? true;
             this.inverse = 'inverse' in option ? !!option.inverse : false;
@@ -32497,6 +32501,22 @@
             }
             return null;
         }
+        addCellGroup(cellGroup) {
+            if (this.childrenCount === 0 || this.lastChild.row === cellGroup.row - 1) {
+                this.addChild(cellGroup);
+            }
+            else {
+                let c = this._firstChild;
+                for (let i = 0; i < this.childrenCount; i++) {
+                    if (c.row === cellGroup.row - 1) {
+                        this.insertAfter(cellGroup, c);
+                        return;
+                    }
+                    c = c._next;
+                }
+                this.addChild(cellGroup);
+            }
+        }
         getChildAt(index) {
             const child = super.getChildAt(index);
             if (child && child.name === 'border-rect') {
@@ -32739,6 +32759,7 @@
                 strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
+                lineDash: cellTheme?.group?.lineDash ?? undefined,
                 lineCap: 'square',
                 clip: true,
                 cornerRadius: cellTheme.group.cornerRadius
@@ -32746,7 +32767,7 @@
             cellGroup.role = 'cell';
             cellGroup.col = col;
             cellGroup.row = row;
-            columnGroup?.addChild(cellGroup);
+            columnGroup?.addCellGroup(cellGroup);
         }
         cellGroup.AABBBounds.width();
         const chartGroup = new Chart({
@@ -33129,6 +33150,7 @@
             strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
             strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
             cursor: cellTheme?.group?.cursor ?? undefined,
+            lineDash: cellTheme?.group?.lineDash ?? undefined,
             lineCap: 'square',
             clip: true,
             cornerRadius: cellTheme.group.cornerRadius
@@ -33136,7 +33158,7 @@
         cellGroup.role = 'cell';
         cellGroup.col = col;
         cellGroup.row = row;
-        columnGroup?.addChild(cellGroup);
+        columnGroup?.addCellGroup(cellGroup);
         const value = table.getCellValue(col, row);
         const image = createImage({
             x: padding[3],
@@ -33777,6 +33799,7 @@
                 strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
+                lineDash: cellTheme?.group?.lineDash ?? undefined,
                 lineCap: 'square',
                 clip: true,
                 cornerRadius: cellTheme.group.cornerRadius
@@ -33784,7 +33807,7 @@
             cellGroup.role = 'cell';
             cellGroup.col = col;
             cellGroup.row = row;
-            columnGroup?.addChild(cellGroup);
+            columnGroup?.addCellGroup(cellGroup);
         }
         const chartGroup = createSparkLine(col, row, width, height, padding, table);
         if (chartGroup) {
@@ -34539,11 +34562,11 @@
                 child.setAttribute('x', child.attribute.x + detaX);
             }
             else if (child.name === 'content' || child.name === 'text') {
-                child.AABBBounds.width();
-                if (textAlign === 'center') {
+                const childTextAlign = child.attribute.textAlign ?? textAlign;
+                if (childTextAlign === 'center') {
                     child.setAttribute('x', padding[3] + leftIconWidth + (distWidth - (padding[1] + padding[3]) - leftIconWidth - rightIconWidth) / 2);
                 }
-                else if (textAlign === 'right') {
+                else if (childTextAlign === 'right') {
                     child.setAttribute('x', padding[3] + distWidth - (padding[1] + padding[3]) - rightIconWidth);
                 }
                 else ;
@@ -34686,6 +34709,7 @@
             strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
             strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
             cursor: cellTheme?.group?.cursor ?? undefined,
+            lineDash: cellTheme?.group?.lineDash ?? undefined,
             lineCap: 'square',
             clip: true,
             cornerRadius: cellTheme.group.cornerRadius
@@ -34693,7 +34717,7 @@
         cellGroup.role = 'cell';
         cellGroup.col = col;
         cellGroup.row = row;
-        columnGroup?.addChild(cellGroup);
+        columnGroup?.addCellGroup(cellGroup);
         if (customElementsGroup) {
             cellGroup.appendChild(customElementsGroup);
         }
@@ -34757,6 +34781,7 @@
             strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
             strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
             cursor: cellTheme?.group?.cursor ?? undefined,
+            lineDash: cellTheme?.group?.lineDash ?? undefined,
             lineCap: 'square',
             clip: true,
             cornerRadius: cellTheme.group.cornerRadius
@@ -34764,7 +34789,7 @@
         cellGroup.role = 'cell';
         cellGroup.col = col;
         cellGroup.row = row;
-        columnGroup?.addChild(cellGroup);
+        columnGroup?.addCellGroup(cellGroup);
         const value = table.getCellValue(col, row);
         const video = document.createElement('video');
         video.addEventListener('loadeddata', () => {
@@ -34849,6 +34874,7 @@
                 strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
+                lineDash: cellTheme?.group?.lineDash ?? undefined,
                 lineCap: 'square',
                 clip: true,
                 cornerRadius: cellTheme.group.cornerRadius
@@ -34856,7 +34882,7 @@
             cellGroup.role = 'cell';
             cellGroup.col = col;
             cellGroup.row = row;
-            columnGroup?.addChild(cellGroup);
+            columnGroup?.addCellGroup(cellGroup);
         }
         const checkboxComponent = createCheckbox(col, row, colWidth, width, height, padding, cellTheme, define, table);
         if (checkboxComponent) {
@@ -35178,6 +35204,12 @@
                 cornerRadius: cellTheme?.group?.cornerRadius ?? 0,
                 y: table.scenegraph.getCellGroupY(row)
             });
+            oldCellGroup.forEachChildren((child) => {
+                child.setAttributes({
+                    dx: 0,
+                    dy: 0
+                });
+            });
             const textMark = oldCellGroup.getChildByName('text');
             if (textMark) {
                 const text = table.getCellValue(col, row);
@@ -35607,6 +35639,7 @@
                         pickable: !!element.pickable,
                         cursor: element.cursor
                     });
+                    arc.name = element.name;
                     customGroup.appendChild(arc);
                     break;
                 case 'text':
@@ -35629,6 +35662,7 @@
                         pickable: !!element.pickable,
                         fill: element.color ?? element.fill
                     }, element));
+                    text.name = element.name;
                     customGroup.appendChild(text);
                     break;
                 case 'rect':
@@ -35645,6 +35679,7 @@
                         pickable: !!element.pickable,
                         cursor: element.cursor
                     });
+                    rect.name = element.name;
                     customGroup.appendChild(rect);
                     break;
                 case 'circle':
@@ -35659,6 +35694,7 @@
                         pickable: !!element.pickable,
                         cursor: element.cursor
                     });
+                    circle.name = element.name;
                     customGroup.appendChild(circle);
                     break;
                 case 'icon':
@@ -35676,6 +35712,7 @@
                         pickable: !!element.pickable,
                         cursor: element.cursor
                     });
+                    icon.name = element.name;
                     icon.role = 'icon-custom';
                     customGroup.appendChild(icon);
                     break;
@@ -35695,6 +35732,7 @@
                         cursor: element.cursor,
                         shape: element.shape
                     });
+                    image.name = element.name;
                     image.role = 'image-custom';
                     customGroup.appendChild(image);
                     break;
@@ -35705,6 +35743,7 @@
                         pickable: !!element.pickable,
                         cursor: element.cursor
                     });
+                    line.name = element.name;
                     customGroup.appendChild(line);
                     break;
             }
@@ -36817,7 +36856,7 @@
         const oldRowHeights = [];
         const newHeights = [];
         if (update) {
-            for (let row = 0; row < table.rowCount; row++) {
+            for (let row = rowStart; row <= rowEnd; row++) {
                 oldRowHeights[row] = table.getRowHeight(row);
             }
         }
@@ -36907,9 +36946,13 @@
             }
         }
         else {
-            table.clearRowHeightCache();
-            for (let row = 0; row < table.rowCount; row++) {
-                newHeights[row] = table.getRowHeight(row);
+            if (table.rowCount !== table.rowHeightsMap.length) {
+                table.clearRowHeightCache();
+            }
+            if (update) {
+                for (let row = rowStart; row <= rowEnd; row++) {
+                    newHeights[row] = table.getRowHeight(row);
+                }
             }
         }
         if ((rowStart === 0 && rowEnd === table.rowCount - 1) || isClearRowRangeHeightsMap) {
@@ -36958,7 +37001,7 @@
             let actualHeight = 0;
             let actualHeaderHeight = 0;
             for (let row = 0; row < table.rowCount; row++) {
-                const rowHeight = update ? newHeights[row] : table.getRowHeight(row);
+                const rowHeight = update ? newHeights[row] ?? table.getRowHeight(row) : table.getRowHeight(row);
                 if (row < table.columnHeaderLevelCount ||
                     (table.isPivotChart() && row >= table.rowCount - table.bottomFrozenRowCount)) {
                     actualHeaderHeight += rowHeight;
@@ -36998,7 +37041,7 @@
             }
         }
         if (update) {
-            for (let row = 0; row < table.rowCount; row++) {
+            for (let row = rowStart; row <= rowEnd; row++) {
                 const newRowHeight = newHeights[row] ?? table.getRowHeight(row);
                 if (newRowHeight !== oldRowHeights[row]) {
                     table._setRowHeight(row, newRowHeight);
@@ -37366,6 +37409,29 @@
         };
     }
 
+    function getCellMergeRange(cellGroup, scene) {
+        const { mergeStartCol, mergeEndCol, mergeStartRow, mergeEndRow, col, row } = cellGroup;
+        const { colStart, colEnd, rowStart, rowEnd, bodyLeftCol, bodyRightCol, bodyTopRow, bodyBottomRow } = scene.proxy;
+        let cellRangeColStart = mergeStartCol;
+        let cellRangeColEnd = mergeEndCol;
+        let cellRangeRowStart = mergeStartRow;
+        let cellRangeRowEnd = mergeEndRow;
+        if (col >= bodyLeftCol && col <= bodyRightCol) {
+            cellRangeColStart = Math.max(cellGroup.mergeStartCol, colStart);
+            cellRangeColEnd = Math.min(cellGroup.mergeEndCol, colEnd);
+        }
+        if (row >= bodyTopRow && row <= bodyBottomRow) {
+            cellRangeRowStart = Math.max(cellGroup.mergeStartRow, rowStart);
+            cellRangeRowEnd = Math.min(cellGroup.mergeEndRow, rowEnd);
+        }
+        return {
+            colStart: cellRangeColStart,
+            colEnd: cellRangeColEnd,
+            rowStart: cellRangeRowStart,
+            rowEnd: cellRangeRowEnd
+        };
+    }
+
     function updateRowHeight(scene, row, detaY, skipTableHeightMap) {
         if (!skipTableHeightMap) {
             scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);
@@ -37496,8 +37562,9 @@
             for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
                 distHeight += table.getRowHeight(row);
             }
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
                     const singleCellGroup = table.scenegraph.getCell(col, row);
                     singleCellGroup.forEachChildren((child) => {
                         child.setAttributes({
@@ -37802,8 +37869,9 @@
             for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
                 cellHeight += table.getRowHeight(row);
             }
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
                     const singleCellGroup = table.scenegraph.getCell(col, row);
                     singleCellGroup.forEachChildren((child) => {
                         child.setAttributes({
@@ -39299,8 +39367,9 @@
             isValid$1(cellGroup.mergeStartRow) &&
             isValid$1(cellGroup.mergeEndCol) &&
             isValid$1(cellGroup.mergeEndRow)) {
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
                     const key = isCellHover(table.stateManager, col, row, cellGroup);
                     if (key && (!colorKey || key === 'cellBgColor')) {
                         colorKey = key;
@@ -41523,6 +41592,10 @@
         }
         updateCellGroupPosition(cellGroup, newRow, y) {
             cellGroup.row = newRow;
+            cellGroup.mergeStartCol = undefined;
+            cellGroup.mergeStartRow = undefined;
+            cellGroup.mergeEndCol = undefined;
+            cellGroup.mergeEndRow = undefined;
             cellGroup.setAttribute('y', y);
             cellGroup.needUpdate = true;
             cellGroup.needUpdateForAutoRowHeight = true;
@@ -41585,10 +41658,15 @@
         if (cacheCellGroup.row === row) {
             return cacheCellGroup;
         }
-        else if (cacheCellGroup.row > row) {
-            return getCellByCache(cacheCellGroup._prev, row);
+        const prev = cacheCellGroup._prev;
+        const next = cacheCellGroup._next;
+        if (cacheCellGroup.row > row && prev && prev.row === row - 1) {
+            return getCellByCache(prev, row);
+        }
+        if (cacheCellGroup.row < row && next && next.row === row + 1) {
+            return getCellByCache(next, row);
         }
-        return getCellByCache(cacheCellGroup._next, row);
+        return null;
     }
 
     function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, sourceMergeInfo, targetMergeInfo, table) {
@@ -42624,8 +42702,9 @@
             isNumber$2(cellGroup.mergeStartRow) &&
             isNumber$2(cellGroup.mergeEndCol) &&
             isNumber$2(cellGroup.mergeEndRow)) {
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
                     const singleCellGroup = table.scenegraph.getCell(col, row);
                     dealVertical(singleCellGroup, minTop, maxTop, changedCells);
                 }
@@ -42685,8 +42764,9 @@
             isNumber$2(cellGroup.mergeStartRow) &&
             isNumber$2(cellGroup.mergeEndCol) &&
             isNumber$2(cellGroup.mergeEndRow)) {
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
                     const singleCellGroup = table.scenegraph.getCell(col, row);
                     dealHorizontal(singleCellGroup, minLeft, maxLeft, changedCells);
                 }
@@ -43628,9 +43708,10 @@
             isValid$1(cellGroup.mergeStartRow) &&
             isValid$1(cellGroup.mergeEndCol) &&
             isValid$1(cellGroup.mergeEndRow)) {
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
-                    updateCellGroupIcon(scene.getCell(col, row), filter, dealer);
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, scene);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
+                    updateCellGroupIcon(scene.highPerformanceGetCell(col, row), filter, dealer);
                 }
             }
         }
@@ -45195,14 +45276,15 @@
     }
 
     function updateCell(scenegraph, col, row) {
-        const cellGroup = scenegraph.getCell(col, row);
+        const cellGroup = scenegraph.highPerformanceGetCell(col, row);
         if (isValid$1(cellGroup.mergeStartCol) &&
             isValid$1(cellGroup.mergeStartRow) &&
             isValid$1(cellGroup.mergeEndCol) &&
             isValid$1(cellGroup.mergeEndRow)) {
-            for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
-                for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
-                    const mergeCell = scenegraph.getCell(col, row);
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
+                    const mergeCell = scenegraph.highPerformanceGetCell(col, row);
                     mergeCell.addUpdateBoundTag();
                 }
             }
@@ -47991,9 +48073,9 @@
                         if (table.editorManager.editingEditor) {
                             table.editorManager.completeEdit();
                             table.getElement().focus();
-                        }
-                        if (table.getEditor(targetCol, targetRow)) {
-                            table.editorManager.startEditCell(targetCol, targetRow);
+                            if (table.getEditor(targetCol, targetRow)) {
+                                table.editorManager.startEditCell(targetCol, targetRow);
+                            }
                         }
                     }
                 }
@@ -49648,7 +49730,10 @@
         getSortIcon(order, _table, col, row) {
             const icon = order === 'asc' ? this.downIcon : order === 'desc' ? this.upIcon : this.normalIcon;
             const headerC = _table.getHeaderDefine(col, row);
-            if (!headerC || !(headerC.showSort || headerC.sort) || (headerC.columns && headerC.columns.length > 0)) {
+            if (!headerC ||
+                headerC.showSort === false ||
+                (!isValid$1(headerC.showSort) && !headerC.sort) ||
+                (headerC.columns && headerC.columns.length > 0)) {
                 return null;
             }
             return icon;
@@ -51381,6 +51466,9 @@
             this.totalSum = 0;
             this.table = table;
         }
+        get length() {
+            return this.data.size;
+        }
         clear() {
             this.data.clear();
             this.cumulativeSum.clear();
@@ -51604,7 +51692,6 @@
     class BaseTable extends EventTarget$1 {
         internalProps;
         showFrozenIcon = true;
-        showSort = true;
         padding;
         globalDropDownMenu;
         tableNoFrameWidth;
@@ -51627,7 +51714,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.19.0";
+        version = "0.19.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -52253,7 +52340,6 @@
                 }
                 else {
                     absoluteLeft = this.getColsWidth(0, col - 1) || 0;
-                    absoluteLeft += this.scrollLeft;
                 }
             }
             else {
@@ -52267,7 +52353,6 @@
                 }
                 else {
                     absoluteTop = this.getRowsHeight(0, row - 1);
-                    absoluteTop += this.scrollTop;
                 }
             }
             else {
@@ -52364,20 +52449,19 @@
             const isFrozenEndCell = this.isFrozenCell(endCol, endRow);
             let absoluteLeft = this.getColsWidth(0, startCol - 1) || 0;
             let width = this.getColsWidth(startCol, endCol);
-            if (isFrozenStartCell && isFrozenStartCell.col) {
+            if (isFrozenStartCell?.col) {
                 const scrollLeft = this.scrollLeft;
                 absoluteLeft += scrollLeft;
-                if (!isFrozenEndCell || !isFrozenEndCell.col) {
+                if (!isFrozenEndCell?.col) {
                     width -= scrollLeft;
                     width = Math.max(width, this.getColsWidth(startCol, this.frozenColCount - 1));
                 }
             }
-            let absoluteTop = this.getRowsHeight(0, startRow - 1);
+            const absoluteTop = this.getRowsHeight(0, startRow - 1);
             let height = this.getRowsHeight(startRow, endRow);
-            if (isFrozenStartCell && isFrozenStartCell.row) {
+            if (isFrozenStartCell?.row) {
                 const scrollTop = this.scrollTop;
-                absoluteTop += scrollTop;
-                if (!isFrozenEndCell || !isFrozenEndCell.row) {
+                if (!isFrozenEndCell?.row) {
                     height -= scrollTop;
                     height = Math.max(height, this.getRowsHeight(startRow, this.frozenRowCount - 1));
                 }
@@ -55795,14 +55879,17 @@
                 return;
             }
             const target = e?.target;
-            if (this.editingEditor.targetIsOnEditor) {
-                if (target && this.editingEditor.targetIsOnEditor(target)) {
+            const { editingEditor: editor } = this;
+            if (target) {
+                if (editor.targetIsOnEditor) {
+                    if (editor.targetIsOnEditor(target)) {
+                        return;
+                    }
+                }
+                else if (!editor.isEditorElement || editor.isEditorElement(target)) {
                     return;
                 }
             }
-            else if (!this.editingEditor.isEditorElement || (target && this.editingEditor.isEditorElement?.(target))) {
-                return;
-            }
             if (!this.editingEditor.getValue) ;
             const changedValue = this.editingEditor.getValue?.();
             this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
@@ -56391,7 +56478,7 @@
                 else {
                     hd = this.internalProps.layoutMap.headerObjects.find((col) => col && col.field === field);
                 }
-                if (hd?.define?.sort) {
+                if (hd.define.sort !== false) {
                     this.dataSource.sort(hd.field, order, sortFunc);
                     this.internalProps.layoutMap.clearCellRangeMap();
                     this.scenegraph.sortCell();
@@ -56451,7 +56538,9 @@
                         else {
                             hd = this.internalProps.layoutMap.headerObjects.find((col) => col && col.field === field);
                         }
-                        this.dataSource.sort(hd.field, order, sortFunc ?? defaultOrderFn);
+                        if (hd.define.sort !== false) {
+                            this.dataSource.sort(hd.field, order, sortFunc ?? defaultOrderFn);
+                        }
                     }
                 }
                 this.refreshRowColCount();
@@ -57076,70 +57165,9 @@
             this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr();
             this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
             this.resetRowHeaderLevelCount();
-            if (this.columnDimensionTree.tree.children?.length >= 1) {
-                this.columnHeaderObjs = this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, []);
-            }
-            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);
-                const cell = {
-                    id,
-                    title: typeof this.columnHeaderTitle.title === 'string'
-                        ? this.columnHeaderTitle.title
-                        : this.columnsDefine.reduce((title, value) => {
-                            if (typeof value === 'string') {
-                                return title;
-                            }
-                            return title + (title ? `/${value.title}` : `${value.title}`);
-                        }, ''),
-                    field: undefined,
-                    headerType: this.columnHeaderTitle.headerType ?? 'text',
-                    style: this.columnHeaderTitle.headerStyle,
-                    define: {
-                        id,
-                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
-                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
-                    }
-                };
-                this.columnHeaderObjs.push(cell);
-                this._headerObjects[id] = cell;
-            }
+            this._generateColHeaderIds();
             this.colIndex = 0;
-            if (this.rowDimensionTree.tree.children?.length >= 1) {
-                this.rowHeaderObjs =
-                    this.rowHierarchyType === 'tree'
-                        ? this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine)
-                        : this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, []);
-            }
-            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 cell = {
-                    id,
-                    title: typeof this.rowHeaderTitle.title === 'string'
-                        ? this.rowHeaderTitle.title
-                        : this.rowsDefine.reduce((title, value) => {
-                            if (typeof value === 'string') {
-                                return title;
-                            }
-                            return title + (title ? `/${value.title}` : `${value.title}`);
-                        }, ''),
-                    field: undefined,
-                    headerType: this.rowHeaderTitle.headerType ?? 'text',
-                    style: this.rowHeaderTitle.headerStyle,
-                    define: {
-                        id,
-                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
-                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
-                    }
-                };
-                this.rowHeaderObjs.push(cell);
-                this._headerObjects[id] = cell;
-            }
+            this._generateRowHeaderIds();
             if (this._table.isPivotChart()) {
                 this.hasTwoIndicatorAxes = this._indicators.some(indicatorObject => {
                     if (indicatorObject.chartSpec &&
@@ -57243,6 +57271,73 @@
             }
             this.setColumnWidths();
         }
+        _generateColHeaderIds() {
+            if (this.columnDimensionTree.tree.children?.length >= 1) {
+                this.columnHeaderObjs = this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, []);
+            }
+            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);
+                const cell = {
+                    id,
+                    title: typeof this.columnHeaderTitle.title === 'string'
+                        ? this.columnHeaderTitle.title
+                        : this.columnsDefine.reduce((title, value) => {
+                            if (typeof value === 'string') {
+                                return title;
+                            }
+                            return title + (title ? `/${value.title}` : `${value.title}`);
+                        }, ''),
+                    field: undefined,
+                    headerType: this.columnHeaderTitle.headerType ?? 'text',
+                    style: this.columnHeaderTitle.headerStyle,
+                    define: {
+                        id,
+                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
+                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
+                    }
+                };
+                this.columnHeaderObjs.push(cell);
+                this._headerObjects[id] = cell;
+            }
+        }
+        _generateRowHeaderIds() {
+            if (this.rowDimensionTree.tree.children?.length >= 1) {
+                this.rowHeaderObjs =
+                    this.rowHierarchyType === 'tree'
+                        ? this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine)
+                        : this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, []);
+            }
+            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 cell = {
+                    id,
+                    title: typeof this.rowHeaderTitle.title === 'string'
+                        ? this.rowHeaderTitle.title
+                        : this.rowsDefine.reduce((title, value) => {
+                            if (typeof value === 'string') {
+                                return title;
+                            }
+                            return title + (title ? `/${value.title}` : `${value.title}`);
+                        }, ''),
+                    field: undefined,
+                    headerType: this.rowHeaderTitle.headerType ?? 'text',
+                    style: this.rowHeaderTitle.headerStyle,
+                    define: {
+                        id,
+                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
+                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
+                    }
+                };
+                this.rowHeaderObjs.push(cell);
+                this._headerObjects[id] = cell;
+            }
+        }
         _addHeaders(_headerCellIds, row, header, roots) {
             const _this = this;
             function _newRow(row) {
@@ -59101,7 +59196,24 @@
             });
             return totalCount;
         }
-        updateDataset(dataset) {
+        resetHeaderTree() {
+            this._rowHeaderCellIds_FULL = [];
+            this._columnHeaderCellIds = [];
+            const dataset = this.dataset;
+            this.rowTree = dataset.rowHeaderTree;
+            this.columnTree = dataset.colHeaderTree;
+            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._generateColHeaderIds();
+            this.colIndex = 0;
+            this._generateRowHeaderIds();
+            this.resetColumnHeaderLevelCount();
+            this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
+            this._headerObjectMap = this._headerObjects.reduce((o, e) => {
+                o[e.id] = e;
+                return o;
+            }, {});
+            this.setPagination(this.pagination);
         }
     }
     function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
@@ -59721,14 +59833,14 @@
             this.needSplitPositiveAndNegative = needSplitPositiveAndNegative ?? false;
             this.rowsIsTotal = new Array(this.rows?.length ?? 0).fill(false);
             this.colsIsTotal = new Array(this.columns?.length ?? 0).fill(false);
-            if (this.totals?.row?.showSubTotals) {
+            if (this.totals?.row && this.totals.row.showSubTotals !== false) {
                 for (let i = 0, len = this.totals?.row?.subTotalsDimensions?.length; i < len; i++) {
                     const dimension = this.totals.row.subTotalsDimensions[i];
                     const dimensionIndex = this.rows.indexOf(dimension);
                     this.rowsIsTotal[dimensionIndex] = true;
                 }
             }
-            if (this.totals?.column?.showSubTotals) {
+            if (this.totals?.column && this.totals.column.showSubTotals !== false) {
                 for (let i = 0, len = this.totals?.column?.subTotalsDimensions?.length; i < len; i++) {
                     const dimension = this.totals.column.subTotalsDimensions[i];
                     const dimensionIndex = this.columns.indexOf(dimension);
@@ -59971,8 +60083,7 @@
                         isToTalRecord = true;
                         break;
                     }
-                    else if (this.dataConfig?.totals?.row?.showSubTotals &&
-                        this.dataConfig?.totals?.row?.subTotalsDimensions.indexOf(this.rows[l - 1]) >= 0) {
+                    else if (this.dataConfig?.totals?.row?.subTotalsDimensions.indexOf(this.rows[l - 1]) >= 0) {
                         if (this.rowHierarchyType === 'grid') {
                             rowKey.push(this.rowSubTotalLabel);
                         }
@@ -59996,8 +60107,7 @@
                         isToTalRecord = true;
                         break;
                     }
-                    else if (this.dataConfig?.totals?.column?.showSubTotals &&
-                        this.dataConfig?.totals?.column?.subTotalsDimensions.indexOf(this.columns[n - 1]) >= 0) {
+                    else if (this.dataConfig?.totals?.column?.subTotalsDimensions.indexOf(this.columns[n - 1]) >= 0) {
                         colKey.push(this.colSubTotalLabel);
                         isToTalRecord = true;
                         break;
@@ -60103,6 +60213,19 @@
             this.sorted = false;
             this.sortRules = sortRules;
             this.sortKeys();
+            if (!this.customRowTree) {
+                if (this.rowHierarchyType === 'tree') {
+                    this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows, this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
+                        (!this.indicatorsAsCol && this.columns.length === 0) ||
+                        (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel);
+                }
+                else {
+                    this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows, this.indicatorsAsCol ? undefined : this.indicators, this.rowsIsTotal, this.totals?.row?.showGrandTotals || (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.rowSubTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false, this.totals?.row?.showSubTotalsOnTop ?? false);
+                }
+            }
+            if (!this.customColTree) {
+                this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns, this.indicatorsAsCol ? this.indicators : undefined, this.colsIsTotal, this.totals?.column?.showGrandTotals || (!this.indicatorsAsCol && this.columns.length === 0), this.colGrandTotalLabel, this.colSubTotalLabel, this.totals?.column?.showGrandTotalsOnLeft ?? false, this.totals?.column?.showSubTotalsOnLeft ?? false);
+            }
         }
         updateFilterRules(filterRules, isResetTree = false) {
             this.filterRules = filterRules;
@@ -60271,9 +60394,9 @@
                         let bChanged = b;
                         if (sorter.fieldIndex < fieldArr.length - 1) {
                             aChanged = a.slice(0, sorter.fieldIndex + 1);
-                            aChanged.push(isRow ? that.totals?.row?.subTotalLabel : that.totals?.column?.subTotalLabel);
+                            aChanged.push(isRow ? that.rowSubTotalLabel : that.colSubTotalLabel);
                             bChanged = b.slice(0, sorter.fieldIndex + 1);
-                            bChanged.push(isRow ? that.totals?.row?.subTotalLabel : that.totals?.column?.subTotalLabel);
+                            bChanged.push(isRow ? that.rowSubTotalLabel : that.colSubTotalLabel);
                         }
                         comparison = sorter.func(aChanged, bChanged);
                     }
@@ -60323,8 +60446,8 @@
         }
         totalStatistics() {
             const that = this;
-            if ((that?.totals?.column?.showSubTotals && that?.totals?.column?.subTotalsDimensions?.length >= 1) ||
-                (that?.totals?.row?.showSubTotals && that?.totals?.row?.subTotalsDimensions?.length >= 1) ||
+            if (that?.totals?.column?.subTotalsDimensions?.length >= 1 ||
+                that?.totals?.row?.subTotalsDimensions?.length >= 1 ||
                 that?.totals?.column?.showGrandTotals ||
                 that?.totals?.row?.showGrandTotals) {
                 const rowTotalKeys = [];
@@ -60339,7 +60462,7 @@
                         const dimensionIndex = that.columns.indexOf(dimension);
                         if (dimensionIndex >= 0) {
                             const colTotalKey = colKey.slice(0, dimensionIndex + 1);
-                            colTotalKey.push(that.totals?.column?.subTotalLabel ?? '小计');
+                            colTotalKey.push(that.colSubTotalLabel);
                             const flatColTotalKey = colTotalKey.join(this.stringJoinChar);
                             if (this.totalRecordsTree?.[flatRowKey]?.[flatColTotalKey]) {
                                 this.tree[flatRowKey][flatColTotalKey] = this.totalRecordsTree?.[flatRowKey]?.[flatColTotalKey];
@@ -60396,7 +60519,7 @@
                             if (dimensionIndex >= 0 && dimensionIndex < that.rows.length - 1) {
                                 const rowTotalKey = rowKey.slice(0, dimensionIndex + 1);
                                 if (this.rowHierarchyType === 'grid') {
-                                    rowTotalKey.push(that.totals?.row?.subTotalLabel ?? '小计');
+                                    rowTotalKey.push(that.rowSubTotalLabel);
                                 }
                                 const flatRowTotalKey = rowTotalKey.join(this.stringJoinChar);
                                 if (!this.tree[flatRowTotalKey]) {
@@ -61216,6 +61339,7 @@
         updateSortRules(sortRules) {
             this.internalProps.dataConfig.sortRules = sortRules;
             this.dataset.updateSortRules(sortRules);
+            this.internalProps.layoutMap.resetHeaderTree();
             this.scenegraph.clearCells();
             this.refreshHeader();
             this.scenegraph.createSceneGraph();
@@ -61938,7 +62062,10 @@
         updateSortRules(sortRules) {
             this.internalProps.dataConfig.sortRules = sortRules;
             this.dataset.updateSortRules(sortRules);
-            this.internalProps.layoutMap.updateDataset(this.dataset);
+            this.internalProps.layoutMap.resetHeaderTree();
+            this.scenegraph.clearCells();
+            this.refreshHeader();
+            this.scenegraph.createSceneGraph();
             this.render();
         }
         updatePivotSortState(pivotSortStateConfig) {
@@ -62987,7 +63114,7 @@
     }
 
     registerForVrender();
-    const version = "0.19.0";
+    const version = "0.19.1";
     function getIcons() {
         return get$1();
     }