@visactor/vtable 1.7.3 → 1.7.5-alpha.0

package/dist/vtable.js

@@ -25611,6 +25611,10 @@
     (function (SortType) {
         SortType["ASC"] = "ASC";
         SortType["DESC"] = "DESC";
+        SortType["NORMAL"] = "NORMAL";
+        SortType["desc"] = "desc";
+        SortType["asc"] = "asc";
+        SortType["normal"] = "normal";
     })(SortType || (SortType = {}));
 
     var IconPosition;
@@ -28871,6 +28875,7 @@
         }
         reset() {
             this.records = [];
+            this.clearCacheValue();
         }
     }
     class RecordAggregator extends Aggregator {
@@ -29016,7 +29021,7 @@
                 }
                 if (record.className === 'Aggregator') {
                     const value = record.value();
-                    this.sum += value;
+                    this.sum += value ?? 0;
                     if (this.needSplitPositiveAndNegativeForSum) {
                         if (value > 0) {
                             this.positiveSum += value;
@@ -29041,7 +29046,7 @@
             }
         }
         value() {
-            return this.sum;
+            return this.records?.length >= 1 ? this.sum : 0;
         }
         positiveValue() {
             return this.positiveSum;
@@ -29050,6 +29055,7 @@
             return this.nagetiveSum;
         }
         reset() {
+            super.reset();
             this.records = [];
             this.sum = 0;
         }
@@ -29061,7 +29067,7 @@
                     const record = this.records[i];
                     if (record.className === 'Aggregator') {
                         const value = record.value();
-                        this.sum += value;
+                        this.sum += value ?? 0;
                         if (this.needSplitPositiveAndNegativeForSum) {
                             if (value > 0) {
                                 this.positiveSum += value;
@@ -29156,7 +29162,7 @@
             }
         }
         value() {
-            return this.sum / this.count;
+            return this.records?.length >= 1 ? this.sum / this.count : undefined;
         }
         reset() {
             this.records = [];
@@ -29210,7 +29216,7 @@
             }
         }
         value() {
-            return this.max;
+            return this.records?.length >= 1 ? this.max : undefined;
         }
         reset() {
             this.records = [];
@@ -29263,7 +29269,7 @@
             }
         }
         value() {
-            return this.min;
+            return this.records?.length >= 1 ? this.min : undefined;
         }
         reset() {
             this.records = [];
@@ -29288,16 +29294,23 @@
             }
         }
     }
-    function typeSort(a, b) {
+    function typeSort(a, b, sortType) {
+        if (sortType === SortType.NORMAL || sortType === SortType.normal) {
+            return 0;
+        }
+        const factor = sortType === SortType.DESC || sortType === SortType.desc ? -1 : 1;
         if (a && b) {
-            return a.toString().localeCompare(b.toString(), 'zh');
+            return a.toString().localeCompare(b.toString(), 'zh') * factor;
         }
         if (a) {
-            return 1;
+            return 1 * factor;
         }
-        return -1;
+        return -1 * factor;
     }
-    function naturalSort(as, bs) {
+    function naturalSort(as, bs, sortType) {
+        if (sortType === SortType.NORMAL || sortType === SortType.normal) {
+            return 0;
+        }
         const rx = /(\d+)|(\D+)/g;
         const rd = /\d/;
         const rz = /^0/;
@@ -29307,40 +29320,41 @@
         let b1;
         let nas = 0;
         let nbs = 0;
+        const factor = sortType === SortType.DESC || sortType === SortType.desc ? -1 : 1;
         if (bs !== null && as === null) {
-            return -1;
+            return -1 * factor;
         }
         if (as !== null && bs === null) {
-            return 1;
+            return 1 * factor;
         }
         if (typeof as === 'number' && isNaN(as)) {
-            return -1;
+            return -1 * factor;
         }
         if (typeof bs === 'number' && isNaN(bs)) {
-            return 1;
+            return 1 * factor;
         }
         nas = +as;
         nbs = +bs;
         if (nas < nbs) {
-            return -1;
+            return -1 * factor;
         }
         if (nas > nbs) {
-            return 1;
+            return 1 * factor;
         }
         if (typeof as === 'number' && typeof bs !== 'number') {
-            return -1;
+            return -1 * factor;
         }
         if (typeof bs === 'number' && typeof as !== 'number') {
-            return 1;
+            return 1 * factor;
         }
         if (typeof as === 'number' && typeof bs === 'number') {
             return 0;
         }
         if (isNaN(nbs) && !isNaN(nas)) {
-            return -1;
+            return -1 * factor;
         }
         if (isNaN(nas) && !isNaN(nbs)) {
-            return 1;
+            return 1 * factor;
         }
         a = String(as);
         b = String(bs);
@@ -29348,7 +29362,7 @@
             return 0;
         }
         if (!(rd.test(a) && rd.test(b))) {
-            return a > b ? 1 : -1;
+            return (a > b ? 1 : -1) * factor;
         }
         a = a.match(rx);
         b = b.match(rx);
@@ -29357,12 +29371,12 @@
             b1 = b.shift();
             if (a1 !== b1) {
                 if (rd.test(a1) && rd.test(b1)) {
-                    return a1.replace(rz, '.0') - b1.replace(rz, '.0');
+                    return (a1.replace(rz, '.0') - b1.replace(rz, '.0')) * factor;
                 }
-                return a1 > b1 ? 1 : -1;
+                return (a1 > b1 ? 1 : -1) * factor;
             }
         }
-        return a.length - b.length;
+        return (a.length - b.length) * factor;
     }
     function sortBy(order) {
         let x;
@@ -29375,35 +29389,43 @@
                 lowercase_mapping[x.toLowerCase()] = i;
             }
         }
-        return function (a, b) {
+        return function (a, b, sortType) {
+            if (sortType === SortType.NORMAL || sortType === SortType.normal) {
+                return 0;
+            }
+            const factor = sortType === SortType.DESC || sortType === SortType.desc ? -1 : 1;
+            let comparison;
             if (mapping[a] !== null && mapping[a] !== undefined && mapping[b] !== null && mapping[b] !== undefined) {
-                return mapping[a] - mapping[b];
+                comparison = mapping[a] - mapping[b];
             }
             else if (mapping[a] !== null && mapping[a] !== undefined) {
-                return -1;
+                comparison = -1;
             }
             else if (mapping[b] !== null && mapping[b] !== undefined) {
-                return 1;
+                comparison = 1;
             }
             else if (lowercase_mapping[a] !== null &&
                 mapping[a] !== undefined &&
                 lowercase_mapping[b] !== null &&
                 mapping[b] !== undefined) {
-                return lowercase_mapping[a] - lowercase_mapping[b];
+                comparison = lowercase_mapping[a] - lowercase_mapping[b];
             }
             else if (lowercase_mapping[a] === null ||
                 mapping[a] === undefined ||
                 lowercase_mapping[b] === null ||
                 mapping[b] === undefined) {
-                return 0;
+                comparison = 0;
             }
             else if (lowercase_mapping[a] !== null && mapping[a] !== undefined) {
-                return -1;
+                comparison = -1;
             }
             else if (lowercase_mapping[b] !== null && mapping[b] !== undefined) {
-                return 1;
+                comparison = 1;
+            }
+            if (isValid$1(comparison)) {
+                return comparison * factor;
             }
-            return naturalSort(a, b);
+            return naturalSort(a, b, sortType);
         };
     }
     function _getDependAggregatorValues(aggregators, dependIndicatorKeys) {
@@ -30557,6 +30579,7 @@
                         const groupResult = [];
                         for (let i = 0; i < records.length; i++) {
                             dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0);
+                            records[i].vtableOriginIndex = i;
                         }
                         return groupResult;
                     }
@@ -30637,18 +30660,16 @@
         if (value !== undefined) {
             if (map.has(value)) {
                 const index = map.get(value);
-                dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);
-            }
-            else {
-                map.set(value, children.length);
-                children.push({
-                    vtableMerge: true,
-                    vtableMergeName: value,
-                    children: [],
-                    map: new Map()
-                });
-                dealWithGroup(record, children[children.length - 1].children, children[children.length - 1].map, groupByKeys, level + 1);
-            }
+                return dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);
+            }
+            map.set(value, children.length);
+            children.push({
+                vtableMerge: true,
+                vtableMergeName: value,
+                children: [],
+                map: new Map()
+            });
+            return dealWithGroup(record, children[children.length - 1].children, children[children.length - 1].map, groupByKeys, level + 1);
         }
     }
     function syncGroupCollapseState(oldSource, newSource, oldGroupMap, newGroupMap) {
@@ -35484,7 +35505,7 @@
                     let customRender;
                     let customLayout;
                     const cellLocation = scene.table.getCellLocation(col, row);
-                    const { vtableMerge } = scene.table.getCellRawRecord(col, row);
+                    const { vtableMerge } = scene.table.getCellRawRecord(col, row) || {};
                     if (vtableMerge && scene.table.options.groupTitleCustomLayout) {
                         customLayout = scene.table.options.groupTitleCustomLayout;
                     }
@@ -35839,7 +35860,7 @@
                     let customRender;
                     let customLayout;
                     const cellType = scene.table.getCellLocation(col, row);
-                    const { vtableMerge } = scene.table.getCellRawRecord(col, row);
+                    const { vtableMerge } = scene.table.getCellRawRecord(col, row) || {};
                     if (vtableMerge && scene.table.options.groupTitleCustomLayout) {
                         customLayout = scene.table.options.groupTitleCustomLayout;
                     }
@@ -38681,7 +38702,7 @@
         time = BaseRenderContributionTime.beforeFillStroke;
         useStyle = true;
         order = 0;
-        drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
+        drawShape(group, context, xOrigin, yOrigin, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
             const table = group.stage.table;
             if (!table) {
                 return;
@@ -38691,89 +38712,80 @@
                 const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();
                 const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();
                 const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'row-header') {
                 const x = 0;
                 const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();
                 const width = table.getFrozenColsWidth();
                 const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'col-header') {
                 const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();
                 const y = 0;
                 const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();
                 const height = table.getFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'right-frozen') {
                 const x = 0;
                 const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();
                 const width = table.getRightFrozenColsWidth();
                 const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'bottom-frozen') {
                 const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();
                 const y = 0;
                 const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();
                 const height = table.getBottomFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'corner-header') {
                 const x = 0;
                 const y = 0;
                 const width = table.getFrozenColsWidth();
                 const height = table.getFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'corner-right-top-header') {
                 const x = 0;
                 const y = 0;
                 const width = table.getRightFrozenColsWidth();
                 const height = table.getFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'corner-right-bottom-header') {
                 const x = 0;
                 const y = 0;
                 const width = table.getRightFrozenColsWidth();
                 const height = table.getBottomFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
             else if (group.role === 'corner-left-bottom-header') {
                 const x = 0;
                 const y = 0;
                 const width = table.getFrozenColsWidth();
                 const height = table.getBottomFrozenRowsHeight();
-                context.beginPath();
-                context.rect(x, y, width, height);
+                drawClipRect(context, x, y, width, height);
             }
         }
     };
     ClipBodyGroupBeforeRenderContribution = __decorate([
         injectable()
     ], ClipBodyGroupBeforeRenderContribution);
-    let ClipBodyGroupAfterRenderContribution = class ClipBodyGroupAfterRenderContribution {
-        time = BaseRenderContributionTime.afterFillStroke;
-        useStyle = true;
-        order = 0;
-        drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
-            if (group.role === 'body') ;
+    const precision = Math.pow(2, 24);
+    function drawClipRect(context, x, y, width, height) {
+        context.beginPath();
+        const matrix = context.applyedMatrix;
+        if (Math.abs(matrix.f) > precision || Math.abs(matrix.g) > precision) {
+            context.rect(x - precision, y - precision, width + precision * 2, height + precision * 2);
         }
-    };
-    ClipBodyGroupAfterRenderContribution = __decorate([
-        injectable()
-    ], ClipBodyGroupAfterRenderContribution);
+        else {
+            context.rect(x, y, width, height);
+        }
+    }
     function getCellSizeForDraw(group, width, height, bottomRight) {
         const table = group.stage.table;
         if (group.role === 'cell') {
@@ -39223,8 +39235,6 @@
         bind(GroupRenderContribution).toService(AdjustPosGroupAfterRenderContribution);
         bind(ClipBodyGroupBeforeRenderContribution).toSelf().inSingletonScope();
         bind(GroupRenderContribution).toService(ClipBodyGroupBeforeRenderContribution);
-        bind(ClipBodyGroupAfterRenderContribution).toSelf().inSingletonScope();
-        bind(GroupRenderContribution).toService(ClipBodyGroupAfterRenderContribution);
         bind(VTableDrawItemInterceptorContribution).toSelf().inSingletonScope();
         bind(DrawItemInterceptor).toService(VTableDrawItemInterceptorContribution);
         bind(SuffixTextBeforeRenderContribution).toSelf().inSingletonScope();
@@ -46814,6 +46824,18 @@
             checkedState[targetIndex] = sourceRecord;
         }
     }
+    function getGroupCheckboxState(table) {
+        const result = [];
+        const dataSource = table.dataSource;
+        const groupKeyLength = dataSource.dataConfig.groupByRules.length + 1;
+        dataSource.currentIndexedData.forEach((indexArr, index) => {
+            if (isArray$1(indexArr) && indexArr.length === groupKeyLength) {
+                const { vtableOriginIndex } = dataSource.getRawRecord(indexArr);
+                result[vtableOriginIndex] = table.stateManager.checkedState[indexArr];
+            }
+        });
+        return result;
+    }
 
     function updateResizeRow(xInTable, yInTable, state) {
         xInTable = Math.ceil(xInTable);
@@ -47752,8 +47774,8 @@
         triggerSort(col, row, iconMark, event) {
             if (this.table.isPivotTable()) {
                 const sortState = this.table.getPivotSortState(col, row);
-                const order = sortState ? sortState.toUpperCase() : 'DESC';
-                const new_order = order === 'ASC' ? 'DESC' : 'ASC';
+                const order = sortState ? sortState.toUpperCase() : 'NORMAL';
+                const new_order = order === 'ASC' ? 'DESC' : order === 'DESC' ? 'NORMAL' : 'ASC';
                 this.table.sort(col, row, new_order);
                 this.table.fireListeners(PIVOT_TABLE_EVENT_TYPE.PIVOT_SORT_CLICK, {
                     col: col,
@@ -48631,27 +48653,11 @@
             }
         });
         table.scenegraph.tableGroup.addEventListener('pointertap', (e) => {
-            if (table.stateManager.columnResize.resizing || table.stateManager.columnMove.moving) {
-                return;
-            }
             const eventArgsSet = getCellEventArgsSet(e);
-            eventManager.dealIconClick(e, eventArgsSet);
-            if (!eventArgsSet?.eventArgs) {
-                return;
-            }
-            if (eventManager.touchSetTimeout) {
-                if (e.pointerType === 'touch') {
-                    const eventArgsSet = getCellEventArgsSet(e);
-                    if (eventManager.touchSetTimeout) {
-                        clearTimeout(eventManager.touchSetTimeout);
-                        const isHasSelected = !!stateManager.select.ranges?.length;
-                        eventManager.dealTableSelect(eventArgsSet);
-                        stateManager.endSelectCells(true, isHasSelected);
-                        eventManager.touchSetTimeout = undefined;
-                    }
-                }
-            }
-            if (!eventManager.touchMove && e.button === 0 && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
+            if (!eventManager.touchMove &&
+                e.button === 0 &&
+                eventArgsSet.eventArgs &&
+                table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
                 const { col, row } = eventArgsSet.eventArgs;
                 const cellInfo = table.getCellInfo(col, row);
                 let icon;
@@ -48680,6 +48686,25 @@
                 };
                 table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
             }
+            if (table.stateManager.columnResize.resizing || table.stateManager.columnMove.moving) {
+                return;
+            }
+            eventManager.dealIconClick(e, eventArgsSet);
+            if (!eventArgsSet?.eventArgs) {
+                return;
+            }
+            if (eventManager.touchSetTimeout) {
+                if (e.pointerType === 'touch') {
+                    const eventArgsSet = getCellEventArgsSet(e);
+                    if (eventManager.touchSetTimeout) {
+                        clearTimeout(eventManager.touchSetTimeout);
+                        const isHasSelected = !!stateManager.select.ranges?.length;
+                        eventManager.dealTableSelect(eventArgsSet);
+                        stateManager.endSelectCells(true, isHasSelected);
+                        eventManager.touchSetTimeout = undefined;
+                    }
+                }
+            }
         });
         table.scenegraph.stage.addEventListener('pointerdown', (e) => {
             const eventArgsSet = getCellEventArgsSet(e);
@@ -51834,7 +51859,7 @@
                 (headerC.columns && headerC.columns.length > 0)) {
                 return null;
             }
-            const icon = order === 'ASC' ? this.downIcon : order === 'DESC' ? this.upIcon : this.normalIcon;
+            const icon = order?.toUpperCase() === 'ASC' ? this.downIcon : order?.toUpperCase() === 'DESC' ? this.upIcon : this.normalIcon;
             return icon;
         }
         getDropDownStateIcons(_table, col, row) {
@@ -52711,7 +52736,8 @@
                 value: node.value,
                 hierarchyState: node.hierarchyState,
                 children: undefined,
-                virtual: node.virtual ?? false
+                virtual: node.virtual ?? false,
+                levelSpan: node.levelSpan ?? 1
             };
             tree.push(diemnsonNode);
             if (node.children) {
@@ -52821,6 +52847,9 @@
             for (let i = 1; i < hd.levelSpan; i++) {
                 if (!_headerCellIds[row + i]) {
                     _headerCellIds[row + i] = [];
+                    for (let col = 0; col < layoutMap.colIndex; col++) {
+                        _headerCellIds[row + i][col] = _headerCellIds[row][col];
+                    }
                 }
                 _headerCellIds[row + i][layoutMap.colIndex] = id;
             }
@@ -54412,7 +54441,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.7.3";
+        version = "1.7.5-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -60802,7 +60831,11 @@
                 this.stateManager.initLeftRecordsCheckState(this.records);
             }
             if (isValid$1(field)) {
-                return this.stateManager.checkedState.map(state => {
+                let stateArr = this.stateManager.checkedState;
+                if (this.options.groupBy) {
+                    stateArr = getGroupCheckboxState(this);
+                }
+                return stateArr.map(state => {
                     return state[field];
                 });
             }
@@ -64643,13 +64676,14 @@
             yField = sparklineSpec.yField.field;
         }
         else if (typeof sparklineSpec.yField === 'string') {
-            const values = dataValue.map((value) => value[sparklineSpec.yField]);
+            const values = getYNumbers(dataValue, sparklineSpec.yField);
             yScale.domain([Math.min(...values), Math.max(...values)]);
             yField = sparklineSpec.yField;
         }
         else {
-            if (Array.isArray(dataValue) && dataValue.every((value) => typeof value === 'number')) {
-                yScale.domain([Math.min(...dataValue), Math.max(...dataValue)]);
+            if (Array.isArray(dataValue)) {
+                const values = getYNumbers(dataValue);
+                yScale.domain([Math.min(...values), Math.max(...values)]);
                 yField = sparklineSpec.yField;
             }
         }
@@ -64784,6 +64818,19 @@
         }
         return group;
     }
+    function getYNumbers(data, field) {
+        const numbers = [];
+        for (let i = 0; i < data.length; i++) {
+            const item = data[i];
+            if (isValid$1(field) && isValid$1(item[field])) {
+                numbers.push(item[field]);
+            }
+            else if (!isValid$1(field) && isValid$1(item)) {
+                numbers.push(item);
+            }
+        }
+        return numbers;
+    }
 
     const regedIcons = get$2();
     function createVideoCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, mayHaveIcon, table, cellTheme, range, isAsync) {
@@ -65845,9 +65892,9 @@
             this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
             let colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr();
             if (this.dataset &&
+                !this._table.isPivotChart() &&
                 (this.dataset.records?.length ?? 0) === 0 &&
-                !this.dataset.customColTree &&
-                !this.dataset.customRowTree) {
+                !this.dataset.customColTree) {
                 colDimensionKeys = this.columnsDefine.map(define => {
                     if (typeof define === 'string') {
                         return define;
@@ -65875,8 +65922,8 @@
             else {
                 rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
                 if (this.dataset &&
+                    !this._table.isPivotChart() &&
                     (this.dataset.records?.length ?? 0) === 0 &&
-                    !this.dataset.customColTree &&
                     !this.dataset.customRowTree) {
                     rowDimensionKeys = this.rowsDefine.map(define => {
                         if (typeof define === 'string') {
@@ -65994,6 +66041,7 @@
             if (this.columnDimensionTree.tree.children?.length >= 1) {
                 let startRow = 0;
                 if (this.dataset &&
+                    !this._table.isPivotChart() &&
                     (this.dataset.records?.length ?? 0) === 0 &&
                     !this.dataset.customColTree &&
                     !this.dataset.customRowTree &&
@@ -66042,6 +66090,7 @@
                 else {
                     let startRow = 0;
                     if (this.dataset &&
+                        !this._table.isPivotChart() &&
                         (this.dataset.records?.length ?? 0) === 0 &&
                         !this.dataset.customColTree &&
                         !this.dataset.customRowTree &&
@@ -66479,7 +66528,8 @@
                     });
                 }
                 else {
-                    this.rowDimensionKeys.forEach((objKey, index) => {
+                    const rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+                    rowDimensionKeys.forEach((objKey, index) => {
                         const dimension = this.rowsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === objKey);
                         dimension &&
                             (returnWidths[index + (this.rowHeaderTitle ? 1 : 0) + this.leftRowSeriesNumberColumnCount] = {
@@ -66768,30 +66818,22 @@
                             : this.columnDimensionTree.totalLevel
                         : this.columnDimensionTree.totalLevel
                     : this.columnDimensionTree.totalLevel;
-                if (this.columnHeaderTitle) {
-                    count += 1;
-                }
-                if (this._table.isPivotChart() &&
-                    this.indicatorsAsCol &&
-                    !this.hasTwoIndicatorAxes &&
-                    checkHasCartesianChart(this.indicatorsDefine)) {
-                    count -= 1;
-                }
                 if (count === 0 &&
                     this.dataset &&
                     !this.dataset.customColTree?.length) {
                     if (this.cornerSetting.titleOnDimension === 'row' && this.cornerSetting.forceShowHeader) {
                         count = 1;
                     }
-                    else if ((this.dataset.records?.length ?? 0) === 0 &&
+                    else if (!this._table.isPivotChart() &&
+                        (this.dataset.records?.length ?? 0) === 0 &&
                         (this.cornerSetting.titleOnDimension === 'column' || this.cornerSetting.titleOnDimension === 'all')) {
                         count = this.columnsDefine.length ?? 0;
                     }
                 }
                 else if (this.dataset &&
+                    !this._table.isPivotChart() &&
                     (this.dataset.records?.length ?? 0) === 0 &&
-                    !this.dataset.customColTree &&
-                    !this.dataset.customRowTree) {
+                    !this.dataset.customColTree) {
                     if (this.cornerSetting.titleOnDimension === 'column' || this.cornerSetting.titleOnDimension === 'all') {
                         count = this.columnsDefine.length ?? 0;
                         if (!this.hideIndicatorName && this.indicatorsAsCol) {
@@ -66799,6 +66841,15 @@
                         }
                     }
                 }
+                if (this.columnHeaderTitle) {
+                    count += 1;
+                }
+                if (this._table.isPivotChart() &&
+                    this.indicatorsAsCol &&
+                    !this.hasTwoIndicatorAxes &&
+                    checkHasCartesianChart(this.indicatorsDefine)) {
+                    count -= 1;
+                }
                 this.columnHeaderLevelCount = count;
                 return;
             }
@@ -66818,28 +66869,21 @@
                 }
                 const rowLevelCount = this.rowDimensionTree.totalLevel;
                 let count = rowLevelCount;
-                if (this.indicatorsAsCol) ;
-                else if (this.hideIndicatorName &&
-                    this.rowDimensionKeys[this.rowDimensionKeys.length - 1] === this.indicatorDimensionKey) {
-                    count = rowLevelCount - 1;
-                }
-                if (this.rowHeaderTitle) {
-                    count += 1;
-                }
                 if (count === 0 &&
                     this.dataset &&
                     !this.dataset.customRowTree?.length) {
                     if (this.cornerSetting.titleOnDimension === 'column' && this.cornerSetting.forceShowHeader) {
                         count = 1;
                     }
-                    else if ((this.dataset.records?.length ?? 0) === 0 &&
+                    else if (!this._table.isPivotChart() &&
+                        (this.dataset.records?.length ?? 0) === 0 &&
                         (this.cornerSetting.titleOnDimension === 'row' || this.cornerSetting.titleOnDimension === 'all')) {
                         count = this.rowsDefine.length ?? 0;
                     }
                 }
                 else if (this.dataset &&
+                    !this._table.isPivotChart() &&
                     (this.dataset.records?.length ?? 0) === 0 &&
-                    !this.dataset.customColTree &&
                     !this.dataset.customRowTree) {
                     if (this.cornerSetting.titleOnDimension === 'row' || this.cornerSetting.titleOnDimension === 'all') {
                         count = this.rowsDefine.length;
@@ -66848,6 +66892,14 @@
                         }
                     }
                 }
+                if (!this.indicatorsAsCol &&
+                    this.hideIndicatorName &&
+                    this.rowDimensionKeys[this.rowDimensionKeys.length - 1] === this.indicatorDimensionKey) {
+                    count = rowLevelCount - 1;
+                }
+                if (this.rowHeaderTitle) {
+                    count += 1;
+                }
                 this.rowHeaderLevelCount = count;
                 return;
             }
@@ -67339,6 +67391,7 @@
             return this.isColumnIndicatorHeader(col, row) || this.isRowIndicatorHeader(col, row);
         }
         toggleHierarchyState(col, row) {
+            this.colIndex = 0;
             const oldRowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL.slice(0);
             const oldRowHeaderCellPositons = oldRowHeaderCellIds.map((id, row) => {
                 return { col, row: row + this.columnHeaderLevelCount };
@@ -67412,7 +67465,7 @@
             let colDimension;
             for (let i = 0; i < dimensions.length; i++) {
                 const highlightDimension = dimensions[i];
-                if ((highlightDimension.isPivotCorner || !highlightDimension.value) &&
+                if ((highlightDimension.isPivotCorner || !isValid$1(highlightDimension.value)) &&
                     i === dimensions.length - 1) {
                     if (this?.cornerSetting?.titleOnDimension === 'row') {
                         let col = 0;
@@ -67827,7 +67880,7 @@
                                 dimension.value === rowDimension.value) ||
                                 (isValid$1(rowDimension.indicatorKey) &&
                                     dimension.indicatorKey === rowDimension.indicatorKey &&
-                                    (!rowDimension.value || dimension.value === rowDimension.value))) {
+                                    (!isValid$1(rowDimension.value) || dimension.value === rowDimension.value))) {
                                 rowArr = dimension.children;
                                 if (needLowestLevel && (!rowArr || rowArr.some(row => row.dimensionKey === 'axis'))) {
                                     rowDimensionFinded = dimension;
@@ -68035,7 +68088,7 @@
             }
             for (let i = 0; i < dimensions.length; i++) {
                 const highlightDimension = dimensions[i];
-                if ((highlightDimension.isPivotCorner || !highlightDimension.value) &&
+                if ((highlightDimension.isPivotCorner || !isValid$1(highlightDimension.value)) &&
                     i === dimensions.length - 1) {
                     return undefined;
                 }
@@ -68386,6 +68439,13 @@
             const dataset = this.dataset;
             this.rowTree = dataset.rowHeaderTree;
             this.columnTree = dataset.colHeaderTree;
+            const beforeRowDimensions = this.rowDimensionTree.tree.children;
+            this.rowTree?.forEach((node, index) => {
+                const beforeRowDimension = beforeRowDimensions.find(item => item.dimensionKey === node.dimensionKey && item.value === node.value);
+                if (beforeRowDimension) {
+                    this._table._syncHierarchyState(beforeRowDimension, node);
+                }
+            });
             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.resetColumnHeaderLevelCount();
@@ -68894,6 +68954,8 @@
         rowFlatKeys = {};
         colKeys = [];
         rowKeys = [];
+        colKeys_normal = [];
+        rowKeys_normal = [];
         rowOrder = 'key_a_to_z';
         colOrder = 'key_a_to_z';
         sorted = false;
@@ -68936,6 +68998,7 @@
         constructor(dataConfig, rows, columns, indicatorKeys, indicators, indicatorsAsCol, records, rowHierarchyType, customColTree, customRowTree, needSplitPositiveAndNegative) {
             this.registerAggregators();
             this.dataConfig = dataConfig;
+            this.filterRules = this.dataConfig?.filterRules;
             this.rowHierarchyType = rowHierarchyType ?? 'grid';
             this.sortRules = this.dataConfig?.sortRules;
             this.aggregationRules = this.dataConfig?.aggregationRules;
@@ -69013,6 +69076,8 @@
                 typeof window !== 'undefined' ? window.performance.now() : 0;
                 this.totalStatistics();
                 typeof window !== 'undefined' ? window.performance.now() : 0;
+                this.rowKeys_normal = this.rowKeys.slice();
+                this.colKeys_normal = this.colKeys.slice();
                 typeof window !== 'undefined' ? window.performance.now() : 0;
                 this.sortKeys();
                 typeof window !== 'undefined' ? window.performance.now() : 0;
@@ -69136,7 +69201,7 @@
         }
         processRecords() {
             let isNeedFilter = false;
-            if ((this.dataConfig?.filterRules?.length ?? 0) >= 1) {
+            if ((this.filterRules?.length ?? 0) >= 1) {
                 isNeedFilter = true;
             }
             if (Array.isArray(this.records)) {
@@ -69162,9 +69227,9 @@
         }
         filterRecord(record) {
             let isReserved = true;
-            if (this.dataConfig?.filterRules) {
-                for (let i = 0; i < this.dataConfig.filterRules.length; i++) {
-                    const filterRule = this.dataConfig?.filterRules[i];
+            if (this.filterRules) {
+                for (let i = 0; i < this.filterRules.length; i++) {
+                    const filterRule = this.filterRules[i];
                     if (filterRule.filterKey) {
                         const filterValue = record[filterRule.filterKey];
                         if (filterRule.filteredValues?.indexOf(filterValue) === -1) {
@@ -69493,6 +69558,7 @@
             this.processRecords();
             this.processCollectedValuesWithSumBy();
             this.processCollectedValuesWithSortBy();
+            this.totalStatistics();
             if (this.dataConfig?.isPivotChart) {
                 this.cacheDeminsionCollectedValues();
             }
@@ -69590,41 +69656,13 @@
                 };
         }
         sortKeys() {
-            const that = this;
+            this.colKeys = this.colKeys_normal.slice();
+            this.rowKeys = this.rowKeys_normal.slice();
             if (!this.sorted) {
                 this.sorted = true;
-                const getValue = function (rowKey, colKey) {
-                    return that.getAggregator(rowKey, colKey, '').value();
-                };
-                switch (this.rowOrder) {
-                    case 'value_a_to_z':
-                        this.rowKeys.sort(function (a, b) {
-                            return naturalSort(getValue(a, []), getValue(b, []));
-                        });
-                        break;
-                    case 'value_z_to_a':
-                        this.rowKeys.sort(function (a, b) {
-                            return -naturalSort(getValue(a, []), getValue(b, []));
-                        });
-                        break;
-                    default:
-                        this.rowKeys.sort(this.arrSort(this.rows, true));
-                }
-                switch (this.colOrder) {
-                    case 'value_a_to_z':
-                        this.colKeys.sort(function (a, b) {
-                            return naturalSort(getValue([], a), getValue([], b));
-                        });
-                        break;
-                    case 'value_z_to_a':
-                        this.colKeys.sort(function (a, b) {
-                            return -naturalSort(getValue([], a), getValue([], b));
-                        });
-                        break;
-                    default:
-                        const sortfun = this.arrSort(this.columns, false);
-                        this.colKeys.sort(sortfun);
-                }
+                this.rowKeys.sort(this.arrSort(this.rows, true));
+                const sortfun = this.arrSort(this.columns, false);
+                this.colKeys.sort(sortfun);
             }
         }
         arrSort(fieldArr, isRow) {
@@ -69659,17 +69697,27 @@
                         let bChanged = b;
                         if (sorter.fieldIndex < fieldArr.length - 1) {
                             aChanged = a.slice(0, sorter.fieldIndex + 1);
-                            aChanged.push(isRow ? that.rowSubTotalLabel : that.colSubTotalLabel);
+                            if (that.rowHierarchyType === 'grid' && isRow) {
+                                aChanged.push(that.rowSubTotalLabel);
+                            }
+                            else if (!isRow) {
+                                aChanged.push(that.colSubTotalLabel);
+                            }
                             bChanged = b.slice(0, sorter.fieldIndex + 1);
-                            bChanged.push(isRow ? that.rowSubTotalLabel : that.colSubTotalLabel);
+                            if (that.rowHierarchyType === 'grid' && isRow) {
+                                bChanged.push(that.rowSubTotalLabel);
+                            }
+                            else if (!isRow) {
+                                bChanged.push(that.colSubTotalLabel);
+                            }
                         }
-                        comparison = sorter.func(aChanged, bChanged);
+                        comparison = sorter.func(aChanged, bChanged, sorter.sortRule?.sortType);
                     }
                     else {
-                        comparison = sorter.func?.(a[sorter.fieldIndex], b[sorter.fieldIndex]);
+                        comparison = sorter.func?.(a[sorter.fieldIndex], b[sorter.fieldIndex], sorter.sortRule?.sortType);
                     }
                     if (comparison !== 0) {
-                        return comparison * (sorter.sortRule?.sortType === SortType.DESC ? -1 : 1);
+                        return comparison;
                     }
                 }
                 return 0;
@@ -69678,9 +69726,10 @@
         getSort(sortRule, isSortRow) {
             const that = this;
             if (sortRule.sortByIndicator) {
-                return (a, b) => {
+                return (a, b, sortType) => {
                     const getValue = function (rowKey, colKey) {
-                        if (rowKey.length < that.rows.length &&
+                        if (that.rowHierarchyType === 'grid' &&
+                            rowKey.length < that.rows.length &&
                             rowKey[rowKey.length - 1] !== that.rowSubTotalLabel &&
                             rowKey[rowKey.length - 1] !== that.rowGrandTotalLabel) {
                             rowKey.push(that.rowSubTotalLabel);
@@ -69693,20 +69742,20 @@
                         return that.getAggregator(rowKey, colKey, sortRule.sortByIndicator).value();
                     };
                     if (isSortRow) {
-                        return naturalSort(getValue(a, sortRule.query), getValue(b, sortRule.query));
+                        return naturalSort(getValue(a, sortRule.query), getValue(b, sortRule.query), sortType);
                     }
-                    return naturalSort(getValue(sortRule.query, a), getValue(sortRule.query, b));
+                    return naturalSort(getValue(sortRule.query, a), getValue(sortRule.query, b), sortType);
                 };
             }
             else if (sortRule.sortBy) {
                 return sortBy(sortRule.sortBy);
             }
-            if (sortRule.sortType) {
-                return typeSort;
-            }
             if (sortRule.sortFunc) {
                 return sortRule.sortFunc;
             }
+            if (sortRule.sortType) {
+                return typeSort;
+            }
             return naturalSort;
         }
         totalStatistics() {
@@ -69759,7 +69808,9 @@
                                                 dependIndicatorKeys: calculatedFieldRule?.dependIndicatorKeys
                                             });
                                         }
-                                        this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                        if (flatColTotalKey !== flatColKey) {
+                                            this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                        }
                                     }
                                     else {
                                         if (!this.tree[flatRowKey][flatColTotalKey][i]) {
@@ -69776,7 +69827,9 @@
                                                     })?.format
                                             });
                                         }
-                                        this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                        if (flatColTotalKey !== flatColKey) {
+                                            this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                        }
                                     }
                                 }
                             }
@@ -69811,7 +69864,9 @@
                                         dependIndicatorKeys: calculatedFieldRule?.dependIndicatorKeys
                                     });
                                 }
-                                this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                if (flatColTotalKey !== flatColKey) {
+                                    this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                }
                             }
                             else {
                                 if (!this.tree[flatRowKey][flatColTotalKey][i]) {
@@ -69828,7 +69883,9 @@
                                             })?.format
                                     });
                                 }
-                                this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                if (flatColTotalKey !== flatColKey) {
+                                    this.tree[flatRowKey][flatColTotalKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                }
                             }
                         }
                     }
@@ -69890,7 +69947,9 @@
                                                 });
                                             }
                                         }
-                                        this.tree[flatRowTotalKey][flatColKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                        if (flatRowTotalKey !== flatRowKey) {
+                                            this.tree[flatRowTotalKey][flatColKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                        }
                                     }
                                 }
                             }
@@ -69939,7 +69998,9 @@
                                         });
                                     }
                                 }
-                                this.tree[flatRowTotalKey][flatColKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                if (flatRowTotalKey !== flatRowKey) {
+                                    this.tree[flatRowTotalKey][flatColKey][i].push(that.tree[flatRowKey]?.[flatColKey]?.[i]);
+                                }
                             }
                         }
                         colCompute(flatRowKey, flatColKey);
@@ -70398,7 +70459,7 @@
                 this.internalProps.rowTree?.forEach((node, index) => {
                     const beforeRowDimension = beforeRowDimensions.find(item => item.dimensionKey === node.dimensionKey && item.value === node.value);
                     if (beforeRowDimension) {
-                        this.syncHierarchyState(beforeRowDimension, node);
+                        this._syncHierarchyState(beforeRowDimension, node);
                     }
                 });
             }
@@ -70531,7 +70592,7 @@
         get rowHierarchyType() {
             return this.internalProps.layoutMap.rowHierarchyType;
         }
-        syncHierarchyState(sourceNode, targetNode) {
+        _syncHierarchyState(sourceNode, targetNode) {
             if (sourceNode.value === targetNode.value && sourceNode.dimensionKey === targetNode.dimensionKey) {
                 targetNode.hierarchyState =
                     targetNode.hierarchyState ?? (targetNode?.children ? sourceNode.hierarchyState : undefined);
@@ -70539,7 +70600,7 @@
                     if (sourceNode?.children?.[index] && targetChildNode) {
                         const beforeRowDimension = sourceNode.children.find((item) => item.dimensionKey === targetChildNode.dimensionKey && item.value === targetChildNode.value);
                         if (beforeRowDimension) {
-                            this.syncHierarchyState(beforeRowDimension, targetChildNode);
+                            this._syncHierarchyState(beforeRowDimension, targetChildNode);
                         }
                     }
                 });
@@ -70972,38 +71033,36 @@
             const sortRules = this.internalProps.dataConfig?.sortRules ?? [];
             for (let i = 0; i < sortRules.length; i++) {
                 const sortRule = sortRules[i];
-                if (sortRule.sortType) {
-                    const dimensions = [];
-                    if (sortRule.sortByIndicator) {
-                        if (sortRule.sortField ===
-                            (this.dataset.indicatorsAsCol
-                                ? this.dataset.rows[this.dataset.rows.length - 1]
-                                : this.dataset.columns[this.dataset.columns.length - 1])) {
-                            for (let j = 0; j < sortRule.query.length; j++) {
-                                dimensions.push({
-                                    dimensionKey: this.dataset.indicatorsAsCol ? this.dataset.columns[j] : this.dataset.rows[j],
-                                    value: sortRule.query[j]
-                                });
-                            }
-                            dimensions.push({
-                                indicatorKey: sortRule.sortByIndicator,
-                                value: this.internalProps.layoutMap.getIndicatorInfo(sortRule.sortByIndicator)
-                                    ?.title ?? sortRule.sortByIndicator
-                            });
-                        }
-                    }
-                    else {
+                const dimensions = [];
+                if (sortRule.sortByIndicator &&
+                    sortRule.sortField ===
+                        (this.dataset.indicatorsAsCol
+                            ? this.dataset.rows[this.dataset.rows.length - 1]
+                            : this.dataset.columns[this.dataset.columns.length - 1])) {
+                    for (let j = 0; j < sortRule.query.length; j++) {
                         dimensions.push({
-                            dimensionKey: sortRule.sortField,
-                            isPivotCorner: true,
-                            value: sortRule.sortField
+                            dimensionKey: this.dataset.indicatorsAsCol ? this.dataset.columns[j] : this.dataset.rows[j],
+                            value: sortRule.query[j]
                         });
                     }
-                    this.pivotSortState.push({
-                        dimensions,
-                        order: sortRule.sortType
+                    dimensions.push({
+                        indicatorKey: sortRule.sortByIndicator,
+                        value: this.internalProps.layoutMap.getIndicatorInfo(sortRule.sortByIndicator)?.title ??
+                            sortRule.sortByIndicator
                     });
                 }
+                else {
+                    dimensions.push({
+                        dimensionKey: sortRule.sortField,
+                        isPivotCorner: true,
+                        value: sortRule.sortField
+                    });
+                }
+                const sortType = sortRule.sortType ? sortRule.sortType.toUpperCase() : 'ASC';
+                this.pivotSortState.push({
+                    dimensions,
+                    order: SortType[sortType]
+                });
             }
         }
         updatePivotSortState(pivotSortStateConfig) {
@@ -71031,9 +71090,11 @@
             const headerDefine = this.getHeaderDefine(col, row);
             if (headerDefine.sort) {
                 if (this.dataset.sortRules) {
+                    const cacheOldDimensionSortRule = {};
                     for (let i = this.dataset.sortRules.length - 1; i >= 0; i--) {
                         const sortRule = this.dataset.sortRules[i];
                         if (headerDefine.dimensionKey && sortRule.sortField === headerDefine.dimensionKey) {
+                            cacheOldDimensionSortRule[sortRule.sortField] = sortRule;
                             this.dataset.sortRules.splice(i, 1);
                         }
                         else if (sortIndicator &&
@@ -71060,10 +71121,10 @@
                         });
                     }
                     else {
-                        this.dataset.sortRules.push({
+                        this.dataset.sortRules.push(Object.assign(cacheOldDimensionSortRule[headerDefine.dimensionKey] ?? {}, {
                             sortField: headerDefine.dimensionKey,
                             sortType: SortType[order]
-                        });
+                        }));
                     }
                 }
                 else {
@@ -71645,6 +71706,11 @@
                 });
             }
         }
+        updateFilterRules(filterRules) {
+            this.internalProps.dataConfig.filterRules = filterRules;
+            this.dataset.updateFilterRules(filterRules);
+            this.renderWithRecreateCells();
+        }
     }
 
     registerAxis();
@@ -73295,7 +73361,7 @@
     }
 
     registerForVrender();
-    const version = "1.7.3";
+    const version = "1.7.5-alpha.0";
     function getIcons() {
         return get$2();
     }