@visactor/vtable 1.19.1 → 1.19.2

package/dist/vtable.js

@@ -29070,6 +29070,8 @@
         key;
         field;
         formatFun;
+        changedValue;
+        children = [];
         _formatedValue;
         constructor(config) {
             this.key = config.key;
@@ -29093,6 +29095,8 @@
         }
         reset() {
             this.records = [];
+            this.changedValue = undefined;
+            this.children = [];
             this.clearCacheValue();
         }
     }
@@ -29108,6 +29112,9 @@
                     this.records.push(record);
                 }
             }
+            if (record.isAggregator && this.children) {
+                this.children.push(record);
+            }
             this.clearCacheValue();
         }
         deleteRecord(record) {
@@ -29115,6 +29122,9 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
+                if (record.isAggregator && this.children) {
+                    this.children = this.children.filter(item => item !== record);
+                }
             }
             this.clearCacheValue();
         }
@@ -29128,13 +29138,23 @@
                         return item;
                     });
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator && this.children) {
+                    this.children = this.children.map(item => {
+                        if (item === oldRecord) {
+                            return newRecord;
+                        }
+                        return item;
+                    });
+                }
                 this.clearCacheValue();
             }
         }
         value() {
-            return this.records;
+            return this.changedValue ?? this.records;
         }
         reset() {
+            this.children = [];
+            this.changedValue = undefined;
             this.records = [];
         }
         recalculate() {
@@ -29149,6 +29169,9 @@
                 if (this.isRecord) {
                     this.records = [record];
                 }
+                if (record.isAggregator && this.children) {
+                    this.children = [record];
+                }
                 if (this.field) {
                     this.fieldValue = record[this.field];
                 }
@@ -29160,6 +29183,9 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
+                if (record.isAggregator && this.children) {
+                    this.children = this.children.filter(item => item !== record);
+                }
                 if (this.field && this.records.length) {
                     this.fieldValue = this.records[this.records.length - 1][this.field];
                 }
@@ -29176,6 +29202,14 @@
                         return item;
                     });
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator && this.children) {
+                    this.children = this.children.map(item => {
+                        if (item === oldRecord) {
+                            return newRecord;
+                        }
+                        return item;
+                    });
+                }
                 if (this.field && this.records.length) {
                     this.fieldValue = this.records[this.records.length - 1][this.field];
                 }
@@ -29183,9 +29217,11 @@
             }
         }
         value() {
-            return this.fieldValue;
+            return this.changedValue ?? this.fieldValue;
         }
         reset() {
+            this.children = [];
+            this.changedValue = undefined;
             this.records = [];
             this.fieldValue = undefined;
         }
@@ -29212,6 +29248,9 @@
                         this.records.push(record);
                     }
                 }
+                if (record.isAggregator && this.children) {
+                    this.children.push(record);
+                }
                 if (this.field) {
                     this.values.push(record[this.field]);
                 }
@@ -29228,6 +29267,14 @@
                         return item;
                     });
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator && this.children) {
+                    this.children = this.children.map(item => {
+                        if (item === oldRecord) {
+                            return newRecord;
+                        }
+                        return item;
+                    });
+                }
                 if (this.field && this.records.length) {
                     this.values = this.records.map(item => item[this.field]);
                 }
@@ -29239,6 +29286,9 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
+                if (record.isAggregator && this.children) {
+                    this.children = this.children.filter(item => item !== record);
+                }
                 if (this.field && this.records.length) {
                     this.values = this.records.map(item => item[this.field]);
                 }
@@ -29249,10 +29299,12 @@
             if (!this.fieldValue) {
                 this.fieldValue = this.aggregationFun?.(this.values, this.records, this.field);
             }
-            return this.fieldValue;
+            return this.changedValue ?? this.fieldValue;
         }
         reset() {
             this.records = [];
+            this.children = [];
+            this.changedValue = undefined;
             this.fieldValue = undefined;
         }
         recalculate() {
@@ -29282,6 +29334,9 @@
                     this.records.push(record);
                 }
             }
+            if (this.children && record.isAggregator) {
+                this.children.push(record);
+            }
             this.clearCacheValue();
         }
         deleteRecord(record) {
@@ -29289,6 +29344,9 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
+                if (record.isAggregator && this.children) {
+                    this.children = this.children.filter(item => item !== record);
+                }
             }
             this.clearCacheValue();
         }
@@ -29302,6 +29360,14 @@
                         return item;
                     });
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator && this.children) {
+                    this.children = this.children.map(item => {
+                        if (item === oldRecord) {
+                            return newRecord;
+                        }
+                        return item;
+                    });
+                }
                 this.clearCacheValue();
             }
         }
@@ -29310,10 +29376,12 @@
                 const aggregatorValue = _getDependAggregatorValues(this.dependAggregators, this.dependIndicatorKeys);
                 this.fieldValue = this.calculateFun?.(aggregatorValue, this.records, this.field);
             }
-            return this.fieldValue;
+            return this.changedValue ?? this.fieldValue;
         }
         reset() {
             this.records = [];
+            this.children = [];
+            this.changedValue = undefined;
             this.fieldValue = undefined;
         }
         recalculate() {
@@ -29339,7 +29407,8 @@
                         this.records.push(record);
                     }
                 }
-                if (record.isAggregator) {
+                if (record.isAggregator && this.children) {
+                    this.children.push(record);
                     const value = record.value();
                     this.sum += value ?? 0;
                     if (this.needSplitPositiveAndNegativeForSum) {
@@ -29371,7 +29440,8 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
-                if (record.isAggregator) {
+                if (record.isAggregator && this.children) {
+                    this.children = this.children.filter(item => item !== record);
                     const value = record.value();
                     this.sum -= value ?? 0;
                     if (this.needSplitPositiveAndNegativeForSum) {
@@ -29408,9 +29478,11 @@
                         return item;
                     });
                 }
-                if (oldRecord.isAggregator) {
+                if (oldRecord.isAggregator && this.children) {
                     const oldValue = oldRecord.value();
+                    this.children = this.children.filter(item => item !== oldRecord);
                     const newValue = newRecord.value();
+                    this.children.push(newRecord);
                     this.sum += newValue - oldValue;
                     if (this.needSplitPositiveAndNegativeForSum) {
                         if (oldValue > 0) {
@@ -29450,7 +29522,7 @@
             }
         }
         value() {
-            return this.records?.length >= 1 ? this.sum : undefined;
+            return this.changedValue ?? (this.records?.length >= 1 ? this.sum : undefined);
         }
         positiveValue() {
             return this.positiveSum;
@@ -29466,7 +29538,24 @@
         recalculate() {
             this.sum = 0;
             this._formatedValue = undefined;
-            if (this.records) {
+            if (this.children && this.children.length > 0) {
+                for (let i = 0; i < this.children.length; i++) {
+                    const child = this.children[i];
+                    if (child.isAggregator) {
+                        const value = child.value();
+                        this.sum += value ?? 0;
+                        if (this.needSplitPositiveAndNegativeForSum) {
+                            if (value > 0) {
+                                this.positiveSum += value;
+                            }
+                            else if (value < 0) {
+                                this.nagetiveSum += value;
+                            }
+                        }
+                    }
+                }
+            }
+            else if (this.records) {
                 for (let i = 0; i < this.records.length; i++) {
                     const record = this.records[i];
                     if (record.isAggregator) {
@@ -29511,6 +29600,9 @@
                     }
                 }
                 if (record.isAggregator) {
+                    if (this.children) {
+                        this.children.push(record);
+                    }
                     this.count += record.value();
                 }
                 else {
@@ -29525,6 +29617,9 @@
                     this.records = this.records.filter(item => item !== record);
                 }
                 if (record.isAggregator) {
+                    if (this.children) {
+                        this.children = this.children.filter(item => item !== record);
+                    }
                     this.count -= record.value();
                 }
                 else {
@@ -29546,19 +29641,41 @@
                 if (oldRecord.isAggregator) {
                     this.count += newRecord.value() - oldRecord.value();
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator && this.children) {
+                    this.children = this.children.map(item => {
+                        if (item === oldRecord) {
+                            return newRecord;
+                        }
+                        return item;
+                    });
+                }
             }
         }
         value() {
-            return this.count;
+            return this.changedValue ?? this.count;
         }
         reset() {
+            this.changedValue = undefined;
+            this.children = [];
             this.records = [];
             this.count = 0;
         }
         recalculate() {
             this.count = 0;
             this._formatedValue = undefined;
-            if (this.records) {
+            if (this.children && this.children.length > 0) {
+                for (let i = 0; i < this.children.length; i++) {
+                    const child = this.children[i];
+                    if (child.isAggregator) {
+                        const value = child.value();
+                        this.count += value ?? 0;
+                    }
+                    else {
+                        this.count++;
+                    }
+                }
+            }
+            else if (this.records) {
                 for (let i = 0; i < this.records.length; i++) {
                     const record = this.records[i];
                     if (record.isAggregator) {
@@ -29586,6 +29703,9 @@
                     }
                 }
                 if (record.isAggregator && record.type === AggregationType.AVG) {
+                    if (this.children) {
+                        this.children.push(record);
+                    }
                     this.sum += record.sum;
                     this.count += record.count;
                 }
@@ -29602,6 +29722,9 @@
                     this.records = this.records.filter(item => item !== record);
                 }
                 if (record.isAggregator && record.type === AggregationType.AVG) {
+                    if (this.children) {
+                        this.children = this.children.filter(item => item !== record);
+                    }
                     this.sum -= record.sum;
                     this.count -= record.count;
                 }
@@ -29623,6 +29746,14 @@
                     });
                 }
                 if (oldRecord.isAggregator && oldRecord.type === AggregationType.AVG) {
+                    if (this.children && newRecord.isAggregator) {
+                        this.children = this.children.map(item => {
+                            if (item === oldRecord) {
+                                return newRecord;
+                            }
+                            return item;
+                        });
+                    }
                     this.sum += newRecord.sum - oldRecord.sum;
                     this.count += newRecord.count - oldRecord.count;
                 }
@@ -29633,9 +29764,11 @@
             }
         }
         value() {
-            return this.records?.length >= 1 ? this.sum / this.count : undefined;
+            return this.changedValue ?? (this.records?.length >= 1 ? this.sum / this.count : undefined);
         }
         reset() {
+            this.changedValue = undefined;
+            this.children = [];
             this.records = [];
             this.sum = 0;
             this.count = 0;
@@ -29644,7 +29777,17 @@
             this.sum = 0;
             this.count = 0;
             this._formatedValue = undefined;
-            if (this.records) {
+            if (this.children && this.children.length > 0) {
+                for (let i = 0; i < this.children.length; i++) {
+                    const child = this.children[i];
+                    if (child.isAggregator && child.type === AggregationType.AVG) {
+                        const childValue = child.value();
+                        this.sum += childValue * child.count;
+                        this.count += child.count;
+                    }
+                }
+            }
+            else if (this.records) {
                 for (let i = 0; i < this.records.length; i++) {
                     const record = this.records[i];
                     if (record.isAggregator && record.type === AggregationType.AVG) {
@@ -29673,6 +29816,9 @@
                     }
                 }
                 if (record.isAggregator) {
+                    if (this.children) {
+                        this.children.push(record);
+                    }
                     this.max = record.max > this.max ? record.max : this.max;
                 }
                 else if (typeof record === 'number') {
@@ -29692,6 +29838,11 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
+                if (record.isAggregator) {
+                    if (this.children) {
+                        this.children = this.children.filter(item => item !== record);
+                    }
+                }
                 this.recalculate();
             }
         }
@@ -29705,20 +29856,41 @@
                         return item;
                     });
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator) {
+                    if (this.children) {
+                        this.children = this.children.map(item => {
+                            if (item === oldRecord) {
+                                return newRecord;
+                            }
+                            return item;
+                        });
+                    }
+                }
                 this.recalculate();
             }
         }
         value() {
-            return this.records?.length >= 1 ? this.max : undefined;
+            return this.changedValue ?? (this.records?.length >= 1 ? this.max : undefined);
         }
         reset() {
             this.records = [];
+            this.changedValue = undefined;
+            this.children = [];
             this.max = Number.MIN_SAFE_INTEGER;
         }
         recalculate() {
             this.max = Number.MIN_SAFE_INTEGER;
             this._formatedValue = undefined;
-            if (this.records) {
+            if (this.children && this.children.length > 0) {
+                for (let i = 0; i < this.children.length; i++) {
+                    const child = this.children[i];
+                    if (child.isAggregator) {
+                        const childValue = child.value();
+                        this.max = Math.max(this.max, childValue);
+                    }
+                }
+            }
+            else if (this.records) {
                 for (let i = 0; i < this.records.length; i++) {
                     const record = this.records[i];
                     if (record.isAggregator) {
@@ -29751,6 +29923,9 @@
                     }
                 }
                 if (record.isAggregator) {
+                    if (this.children) {
+                        this.children.push(record);
+                    }
                     this.min = record.min < this.min ? record.min : this.min;
                 }
                 else if (typeof record === 'number') {
@@ -29770,6 +29945,11 @@
                 if (this.isRecord && this.records) {
                     this.records = this.records.filter(item => item !== record);
                 }
+                if (record.isAggregator) {
+                    if (this.children) {
+                        this.children = this.children.filter(item => item !== record);
+                    }
+                }
                 this.recalculate();
             }
         }
@@ -29783,20 +29963,41 @@
                         return item;
                     });
                 }
+                if (oldRecord.isAggregator && newRecord.isAggregator) {
+                    if (this.children) {
+                        this.children = this.children.map(item => {
+                            if (item === oldRecord) {
+                                return newRecord;
+                            }
+                            return item;
+                        });
+                    }
+                }
                 this.recalculate();
             }
         }
         value() {
-            return this.records?.length >= 1 ? this.min : undefined;
+            return this.changedValue ?? (this.records?.length >= 1 ? this.min : undefined);
         }
         reset() {
             this.records = [];
+            this.changedValue = undefined;
+            this.children = [];
             this.min = Number.MAX_SAFE_INTEGER;
         }
         recalculate() {
             this.min = Number.MAX_SAFE_INTEGER;
             this._formatedValue = undefined;
-            if (this.records) {
+            if (this.children && this.children.length > 0) {
+                for (let i = 0; i < this.children.length; i++) {
+                    const child = this.children[i];
+                    if (child.isAggregator) {
+                        const childValue = child.value();
+                        this.min = Math.min(this.min, childValue);
+                    }
+                }
+            }
+            else if (this.records) {
                 for (let i = 0; i < this.records.length; i++) {
                     const record = this.records[i];
                     if (record.isAggregator) {
@@ -33628,11 +33829,15 @@
             this.updatePagerData();
         }
         initTreeHierarchyState() {
+            this._sourceLength = this._source?.length || 0;
             this.currentIndexedData = Array.from({ length: this._sourceLength }, (_, i) => i);
             let nodeLength = this._sourceLength;
             for (let i = 0; i < nodeLength; i++) {
                 const indexKey = this.currentIndexedData[i];
                 const nodeData = this.getOriginalRecord(indexKey);
+                if (!nodeData) {
+                    continue;
+                }
                 const children = nodeData.filteredChildren ?? nodeData.children;
                 if (children?.length > 0) {
                     if (this.hierarchyExpandLevel > 1) {
@@ -34591,11 +34796,13 @@
                         targetI = targetIndexs.splice(targetIndexs.length - 1, 1)[0];
                         if (sourceIndexs.length >= 1) {
                             const parent = this.getOriginalRecord(sourceIndexs);
-                            const sourceIds = parent.filteredChildren
-                                ? parent.filteredChildren.splice(sourceI, 1)
-                                : parent.children.splice(sourceI, 1);
-                            sourceIds.unshift(targetI, 0);
-                            Array.prototype.splice.apply(parent.filteredChildren ?? parent.children, sourceIds);
+                            if (parent) {
+                                const sourceIds = parent.filteredChildren
+                                    ? parent.filteredChildren.splice(sourceI, 1)
+                                    : parent.children.splice(sourceI, 1);
+                                sourceIds.unshift(targetI, 0);
+                                Array.prototype.splice.apply(parent.filteredChildren ?? parent.children, sourceIds);
+                            }
                         }
                         else {
                             const sourceIds = this.records.splice(sourceI, 1);
@@ -34624,6 +34831,9 @@
             if (this.hierarchyExpandLevel) {
                 for (let i = 0; i < this._sourceLength; i++) {
                     const nodeData = this.getOriginalRecord(i);
+                    if (!nodeData) {
+                        continue;
+                    }
                     const children = nodeData.filteredChildren ?? nodeData.children;
                     children && !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.collapse);
                 }
@@ -34632,6 +34842,9 @@
                 for (let i = 0; i < nodeLength; i++) {
                     const indexKey = this.currentIndexedData[i];
                     const nodeData = this.getOriginalRecord(indexKey);
+                    if (!nodeData) {
+                        continue;
+                    }
                     const children = nodeData.filteredChildren ?? nodeData.children;
                     if (children?.length > 0 && nodeData.hierarchyState === HierarchyState.expand) {
                         this.hasHierarchyStateExpand = true;
@@ -40195,7 +40408,7 @@
                 if (table.options.groupTitleFieldFormat) {
                     value = table.options.groupTitleFieldFormat(rawRecord, col, row, table);
                 }
-                else if (vtableMergeName) {
+                else if (vtableMergeName !== undefined) {
                     value = vtableMergeName;
                 }
             }
@@ -40294,8 +40507,8 @@
         const type = isVtableMerge || isCustomMerge
             ? 'text'
             : table.isHeader(col, row)
-                ? table._getHeaderLayoutMap(col, row).headerType ?? 'text'
-                : table.getBodyColumnType(col, row) ?? 'text';
+                ? (table._getHeaderLayoutMap(col, row).headerType ?? 'text')
+                : (table.getBodyColumnType(col, row) ?? 'text');
         const padding = cellTheme._vtable.padding;
         const textAlign = cellTheme.text.textAlign;
         const textBaseline = cellTheme.text.textBaseline;
@@ -40457,8 +40670,8 @@
                 child.skipMergeUpdate = false;
             }
             else {
-                child.skipMergeUpdate = true;
                 child._dx = child.attribute.dx ?? 0;
+                child.skipMergeUpdate = true;
                 child.setAttributes({
                     dx: (child.attribute.dx ?? 0) + dx
                 });
@@ -46116,16 +46329,19 @@
         const adaptiveColumns = [];
         const sparklineColumns = [];
         let totalSparklineAbleWidth = 0;
+        const maxWidthColumnMap = new Map();
+        const minWidthColumnMap = new Map();
         for (let col = startCol; col < endColPlus1; col++) {
             const width = update ? newWidths[col] ?? table.getColWidth(col) : table.getColWidth(col);
             const maxWidth = table.getMaxColWidth(col);
             const minWidth = table.getMinColWidth(col);
-            if (width !== maxWidth && width !== minWidth) {
-                actualWidth += width;
-                adaptiveColumns.push(col);
+            actualWidth += width;
+            adaptiveColumns.push(col);
+            if (maxWidth === width) {
+                maxWidthColumnMap.set(col, width);
             }
-            else {
-                totalDrawWidth -= width;
+            else if (minWidth === width) {
+                minWidthColumnMap.set(col, width);
             }
             if (table.options.customConfig?.shrinkSparklineFirst) {
                 const bodyCellType = table.getBodyColumnType(col, 0);
@@ -46135,6 +46351,26 @@
                 }
             }
         }
+        if (actualWidth > totalDrawWidth) {
+            for (const [col, width] of minWidthColumnMap) {
+                totalDrawWidth -= width;
+                actualWidth -= width;
+                const index = adaptiveColumns.indexOf(col);
+                if (index !== -1) {
+                    adaptiveColumns.splice(index, 1);
+                }
+            }
+        }
+        else if (actualWidth < totalDrawWidth) {
+            for (const [col, width] of maxWidthColumnMap) {
+                totalDrawWidth -= width;
+                actualWidth -= width;
+                const index = adaptiveColumns.indexOf(col);
+                if (index !== -1) {
+                    adaptiveColumns.splice(index, 1);
+                }
+            }
+        }
         const factor = totalDrawWidth / actualWidth;
         if (table.options.customConfig?.shrinkSparklineFirst &&
             factor < 1 &&
@@ -46279,16 +46515,16 @@
                     if (table.options.groupTitleFieldFormat) {
                         value = table.options.groupTitleFieldFormat(rawRecord, col, row, table);
                     }
-                    else if (vtableMergeName) {
+                    else if (vtableMergeName !== undefined) {
                         value = vtableMergeName;
                     }
                 }
             }
             const type = isVtableMerge || isCustomMerge
                 ? 'text'
-                : (table.isHeader(col, row)
-                    ? table._getHeaderLayoutMap(col, row).headerType ?? 'text'
-                    : table.getBodyColumnType(col, row)) ?? 'text';
+                : ((table.isHeader(col, row)
+                    ? (table._getHeaderLayoutMap(col, row).headerType ?? 'text')
+                    : table.getBodyColumnType(col, row)) ?? 'text');
             if (isPromise(value)) {
                 createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);
                 dealPromiseData(value, table, callCreateCellForPromiseValue.bind(null, {
@@ -63537,7 +63773,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.19.1";
+        version = "1.19.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -68486,6 +68722,7 @@
         _headerCellIds;
         _columns;
         _columnsIncludeHided;
+        _columnMaxDepth = 0;
         rowSeriesNumberColumn;
         leftRowSeriesNumberColumn;
         rightRowSeriesNumberColumn;
@@ -68513,6 +68750,7 @@
             this._columns = [];
             this._columnsIncludeHided = [];
             this._headerCellIds = [];
+            this._columnMaxDepth = this._calculateMaxDepth(columns);
             this.hierarchyIndent = hierarchyIndent ?? 20;
             this.hierarchyTextStartAlignment = table.options.hierarchyTextStartAlignment;
             this.columnHierarchyType = table.options.headerHierarchyType;
@@ -69298,7 +69536,19 @@
             const skipRowCount = this.hasAggregationOnTopCount ? this.headerLevelCount + 1 : this.headerLevelCount;
             return skipRowCount + index;
         }
-        _addHeaders(row, column, roots, hideColumnsSubHeader) {
+        _calculateMaxDepth(columns, currentDepth = 0) {
+            let maxDepth = currentDepth;
+            columns.forEach(col => {
+                if (col.columns && col.columns.length > 0) {
+                    const childDepth = this._calculateMaxDepth(col.columns, currentDepth + 1);
+                    if (childDepth > maxDepth) {
+                        maxDepth = childDepth;
+                    }
+                }
+            });
+            return maxDepth;
+        }
+        _addHeaders(row, column, roots, hideColumnsSubHeader, lastLevelSpan) {
             const results = [];
             const rowCells = this._newRow(row, hideColumnsSubHeader);
             column.forEach((hd) => {
@@ -69317,20 +69567,45 @@
                     columnWidthComputeMode: hd.columnWidthComputeMode
                 };
                 results[id] = cell;
-                for (let r = row - 1; r >= 0; r--) {
-                    this._headerCellIds[r] && (this._headerCellIds[r][col] = roots[r]);
+                let maxRow = row;
+                if (hd.levelSpan) {
+                    maxRow = Math.min(row + hd.levelSpan - 1, this._columnMaxDepth - 1);
+                    for (let r = row; r <= maxRow; r++) {
+                        if (!this._headerCellIds[r]) {
+                            this._headerCellIds[r] = [];
+                        }
+                        if (this._headerCellIds[r][col] === undefined) {
+                            this._headerCellIds[r][col] = id;
+                        }
+                    }
+                }
+                if (lastLevelSpan) {
+                    for (let r = maxRow - 1; r >= 0; r--) {
+                        if (this._headerCellIds[r] &&
+                            this._headerCellIds[r][col] === undefined &&
+                            roots[maxRow - lastLevelSpan] !== undefined) {
+                            this._headerCellIds[r][col] = roots[maxRow - lastLevelSpan];
+                        }
+                    }
+                }
+                else {
+                    for (let r = maxRow - 1; r >= 0; r--) {
+                        if (this._headerCellIds[r] && this._headerCellIds[r][col] === undefined && roots[r] !== undefined) {
+                            this._headerCellIds[r][col] = roots[r];
+                        }
+                    }
                 }
                 if (!hideColumnsSubHeader) {
                     rowCells[col] = id;
                 }
-                else if (this._headerCellIds[row - 1]) {
+                else if (this._headerCellIds[row - 1] && this._headerCellIds[row - 1][col] !== undefined) {
                     rowCells[col] = this._headerCellIds[row - 1][col];
                 }
                 const expand = !hd.hierarchyState || hd.hierarchyState === HierarchyState.expand;
                 if (!!hd.columns && !!expand) {
                     const isAllHided = hd.columns.every((c) => c.hide);
                     !isAllHided &&
-                        this._addHeaders(row + 1, hd.columns, [...roots, id], hd.hideColumnsSubHeader || hideColumnsSubHeader).forEach(c => results.push(c));
+                        this._addHeaders(maxRow + 1, hd.columns, [...roots, id], hd.hideColumnsSubHeader || hideColumnsSubHeader, hd.levelSpan).forEach(c => results.push(c));
                 }
                 else {
                     const colDef = {
@@ -69733,7 +70008,13 @@
             const editor = this.table.getEditor(col, row);
             if (editor) {
                 if (this.table.internalProps.layoutMap?.isAggregation?.(col, row)) {
-                    return;
+                    const isPivotTable = this.table.isPivotTable?.();
+                    const updateAggregationOnEditCell = isPivotTable
+                        ? this.table.internalProps?.dataConfig?.updateAggregationOnEditCell
+                        : false;
+                    if (!isPivotTable || (isPivotTable && updateAggregationOnEditCell)) {
+                        return;
+                    }
                 }
                 const record = this.table.getCellRawRecord(col, row);
                 if (record?.vtableMerge) {
@@ -70781,7 +71062,7 @@
             this._hasAutoImageColumn = undefined;
             this.refreshHeader();
             this.dataSource.updateColumns?.(this.internalProps.columns);
-            if (this.records && checkHasAggregationOnColumnDefine(columns)) {
+            if (this.records && checkHasAggregationOnColumnDefine(this.internalProps.columns)) {
                 this.dataSource.processRecords(this.dataSource.dataSourceObj?.records ?? this.dataSource.dataSourceObj);
             }
             this.internalProps.useOneRowHeightFillAll = false;
@@ -80135,6 +80416,12 @@
             this.fullRowDimensionKeys = [];
             this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
             if (this.rowHierarchyType === 'tree') {
+                if (this.extensionRows?.length > 0) {
+                    this.extensionRows.forEach(extensionRow => {
+                        const extensionRowDimensionKeys = extensionRow.rows?.map(row => (typeof row === 'string' ? row : row.dimensionKey)) || [];
+                        this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(extensionRowDimensionKeys);
+                    });
+                }
                 this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
             }
             else if (this.rowHierarchyType === 'grid-tree') {
@@ -81561,6 +81848,23 @@
             this._colHeaderPathCache.clear();
             this._rowHeaderPathCache.clear();
         }
+        isAggregation(col, row) {
+            if (this.isHeader(col, row)) {
+                return false;
+            }
+            const cellHeaderPaths = this.getCellHeaderPaths(col, row);
+            for (const path of cellHeaderPaths.colHeaderPaths) {
+                if (path.role === 'sub-total' || path.role === 'grand-total') {
+                    return true;
+                }
+            }
+            for (const path of cellHeaderPaths.rowHeaderPaths) {
+                if (path.role === 'sub-total' || path.role === 'grand-total') {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
     function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
         if (paddingInner === 1) {
@@ -83230,6 +83534,11 @@
             else {
                 flatColKey = colKey.join(this.stringJoinChar);
             }
+            if (typeof newValue === 'string') {
+                if (!isNaN(parseFloat(newValue))) {
+                    newValue = parseFloat(newValue);
+                }
+            }
             if (this.changedTree[flatRowKey]?.[flatColKey]) {
                 this.changedTree[flatRowKey][flatColKey][indicatorIndex] = newValue;
             }
@@ -83246,6 +83555,134 @@
             if (cellAggregator?.records.length === 1) {
                 cellAggregator.records[0][this.indicatorKeys[indicatorIndex]] = newValue;
             }
+            if (this.dataConfig?.updateAggregationOnEditCell ?? false) {
+                if (cellAggregator) {
+                    cellAggregator.changedValue = newValue;
+                    this.recalculateTotals(rowKey, colKey, indicator);
+                }
+                else {
+                    const newCellAggregator = new SumAggregator({
+                        key: indicator,
+                        field: indicator,
+                        isRecord: true,
+                    });
+                    newCellAggregator.changedValue = newValue;
+                    this.recalculateTotals(rowKey, colKey, indicator, newCellAggregator);
+                }
+            }
+        }
+        recalculateTotals(rowKey = [], colKey = [], indicator, newCellAggregator) {
+            if (!this.totals ||
+                Object.keys(this.tree).length === 0 ||
+                (!(this.totals.row?.showGrandTotals ||
+                    (this.totals.row?.subTotalsDimensions &&
+                        this.totals.row.subTotalsDimensions.length > 0 &&
+                        this.totals.row.showSubTotals !== false)) &&
+                    !(this.totals.column?.showGrandTotals ||
+                        (this.totals.column?.subTotalsDimensions &&
+                            this.totals.column.subTotalsDimensions.length > 0 &&
+                            this.totals.column.showSubTotals !== false)))) {
+                return;
+            }
+            const flatRowKey = Array.isArray(rowKey) ? rowKey.join(this.stringJoinChar) : rowKey;
+            const flatColKey = Array.isArray(colKey) ? colKey.join(this.stringJoinChar) : colKey;
+            const indicatorIndex = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys.indexOf(indicator);
+            const aggregatorsToReset = new Set();
+            const subTotalAggregators = new Set();
+            const rowKeyParts = flatRowKey.split(this.stringJoinChar);
+            const colKeyParts = flatColKey.split(this.stringJoinChar);
+            const addAggregatorToResetSet = (agg, rowKey, colKey) => {
+                if (agg && !(rowKey === flatRowKey && colKey === flatColKey)) {
+                    aggregatorsToReset.add(agg);
+                    if (rowKey === flatRowKey || colKey === flatColKey) {
+                        subTotalAggregators.add(agg);
+                    }
+                }
+            };
+            if (this.totals?.row?.subTotalsDimensions && this.totals.row.showSubTotals !== false) {
+                for (let i = 0; i < this.totals.row.subTotalsDimensions.length; i++) {
+                    const dimension = this.totals.row.subTotalsDimensions[i];
+                    const dimensionIndex = this.rows.indexOf(dimension);
+                    if (dimensionIndex >= 0 && dimensionIndex < rowKeyParts.length) {
+                        const rowSubTotalKeyParts = rowKeyParts.slice(0, dimensionIndex + 1);
+                        if (this.rowHierarchyType !== 'tree') {
+                            rowSubTotalKeyParts.push(this.rowSubTotalLabel);
+                        }
+                        const flatRowSubTotalKey = rowSubTotalKeyParts.join(this.stringJoinChar);
+                        if (this.tree[flatRowSubTotalKey]?.[flatColKey]?.[indicatorIndex]) {
+                            addAggregatorToResetSet(this.tree[flatRowSubTotalKey][flatColKey][indicatorIndex], flatRowSubTotalKey, flatColKey);
+                        }
+                        if (this.totals?.column?.subTotalsDimensions && this.totals.column.showSubTotals !== false) {
+                            for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
+                                const colDimension = this.totals.column.subTotalsDimensions[j];
+                                const colDimensionIndex = this.columns.indexOf(colDimension);
+                                if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
+                                    const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
+                                    colSubTotalKeyParts.push(this.colSubTotalLabel);
+                                    const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
+                                    if (this.tree[flatRowSubTotalKey]?.[flatColSubTotalKey]?.[indicatorIndex]) {
+                                        addAggregatorToResetSet(this.tree[flatRowSubTotalKey][flatColSubTotalKey][indicatorIndex], flatRowSubTotalKey, flatColSubTotalKey);
+                                    }
+                                }
+                            }
+                        }
+                        if (this.totals?.column?.showGrandTotals) {
+                            if (this.tree[flatRowSubTotalKey]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
+                                addAggregatorToResetSet(this.tree[flatRowSubTotalKey][this.colGrandTotalLabel][indicatorIndex], flatRowSubTotalKey, this.colGrandTotalLabel);
+                            }
+                        }
+                    }
+                }
+            }
+            if (this.totals?.row?.showGrandTotals) {
+                if (this.tree[this.rowGrandTotalLabel]?.[flatColKey]?.[indicatorIndex]) {
+                    addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColKey][indicatorIndex], this.rowGrandTotalLabel, flatColKey);
+                }
+                if (this.totals?.column?.subTotalsDimensions && this.totals.column.showSubTotals !== false) {
+                    for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
+                        const colDimension = this.totals.column.subTotalsDimensions[j];
+                        const colDimensionIndex = this.columns.indexOf(colDimension);
+                        if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
+                            const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
+                            colSubTotalKeyParts.push(this.colSubTotalLabel);
+                            const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
+                            if (this.tree[this.rowGrandTotalLabel]?.[flatColSubTotalKey]?.[indicatorIndex]) {
+                                addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColSubTotalKey][indicatorIndex], this.rowGrandTotalLabel, flatColSubTotalKey);
+                            }
+                        }
+                    }
+                }
+                if (this.totals?.column?.showGrandTotals) {
+                    if (this.tree[this.rowGrandTotalLabel]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
+                        addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][this.colGrandTotalLabel][indicatorIndex], this.rowGrandTotalLabel, this.colGrandTotalLabel);
+                    }
+                }
+            }
+            if (this.totals?.column?.subTotalsDimensions && this.totals.column.showSubTotals !== false) {
+                for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
+                    const colDimension = this.totals.column.subTotalsDimensions[j];
+                    const colDimensionIndex = this.columns.indexOf(colDimension);
+                    if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
+                        const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
+                        colSubTotalKeyParts.push(this.colSubTotalLabel);
+                        const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
+                        if (this.tree[flatRowKey]?.[flatColSubTotalKey]?.[indicatorIndex]) {
+                            addAggregatorToResetSet(this.tree[flatRowKey][flatColSubTotalKey][indicatorIndex], flatRowKey, flatColSubTotalKey);
+                        }
+                    }
+                }
+            }
+            if (this.totals?.column?.showGrandTotals) {
+                if (this.tree[flatRowKey]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
+                    addAggregatorToResetSet(this.tree[flatRowKey][this.colGrandTotalLabel][indicatorIndex], flatRowKey, this.colGrandTotalLabel);
+                }
+            }
+            aggregatorsToReset.forEach(agg => {
+                if (newCellAggregator && subTotalAggregators.has(agg)) {
+                    agg.push(newCellAggregator);
+                }
+                agg.recalculate();
+            });
         }
         changeRecordFieldValue(fieldName, oldValue, value) {
             let isIndicatorName = false;
@@ -84708,6 +85145,15 @@
                         this.scenegraph.updateCellContent(sCol, sRow);
                     }
                 }
+                if (this.options.dataConfig?.updateAggregationOnEditCell ?? false) {
+                    for (let col = 0; col < this.colCount; col++) {
+                        for (let row = 0; row < this.rowCount; row++) {
+                            if (this.internalProps.layoutMap.isAggregation(col, row)) {
+                                this.scenegraph.updateCellContent(col, row);
+                            }
+                        }
+                    }
+                }
                 if (this.widthMode === 'adaptive' || (this.autoFillWidth && this.getAllColsWidth() <= this.tableNoFrameWidth)) {
                     if (this.internalProps._widthResizedColMap.size === 0) {
                         this.scenegraph.recalculateColWidths();
@@ -84810,6 +85256,15 @@
                     this.scenegraph.updateCellContent(sCol, sRow);
                 }
             }
+            if (this.options.dataConfig?.updateAggregationOnEditCell ?? false) {
+                for (let col = 0; col < this.colCount; col++) {
+                    for (let row = 0; row < this.rowCount; row++) {
+                        if (this.internalProps.layoutMap.isAggregation(col, row)) {
+                            this.scenegraph.updateCellContent(col, row);
+                        }
+                    }
+                }
+            }
             if (this.widthMode === 'adaptive' || (this.autoFillWidth && this.getAllColsWidth() <= this.tableNoFrameWidth)) {
                 if (this.internalProps._widthResizedColMap.size === 0) {
                     this.scenegraph.recalculateColWidths();
@@ -86735,7 +87190,7 @@
     }
 
     registerForVrender();
-    const version = "1.19.1";
+    const version = "1.19.2";
     function getIcons() {
         return get$2();
     }
@@ -86802,6 +87257,7 @@
     exports.setCustomAlphabetCharSet = setCustomAlphabetCharSet;
     exports.textMeasure = textMeasure;
     exports.themes = themes$1;
+    exports.toBoxArray = toBoxArray$1;
     exports.updateCell = updateCell$1;
     exports.version = version;