@visactor/vtable 1.16.0-alpha.1 → 1.16.1

package/dist/vtable.js

@@ -26687,6 +26687,8 @@
             this.fieldValue = undefined;
         }
         recalculate() {
+            this.fieldValue = undefined;
+            this._formatedValue = undefined;
         }
     }
     class RecalculateAggregator extends Aggregator {
@@ -30229,6 +30231,9 @@
                     },
                     get labelVisible() {
                         return columnResize.labelVisible ?? true;
+                    },
+                    get visibleOnHover() {
+                        return columnResize.visibleOnHover ?? false;
                     }
                 };
             }
@@ -36132,6 +36137,7 @@
                         : autoRowHeight && !table.options.customConfig?.multilinesForXTable
                             ? -1
                             : cellHeight - Math.floor(padding[0] + padding[2]),
+                    pickable: false,
                     dx: (textAlign === 'left' ? hierarchyOffset : 0) + _contentOffset,
                     whiteSpace: table.options.customConfig?.limitContentHeight === false
                         ? 'normal'
@@ -37121,10 +37127,19 @@
         if (type === 'text' || type === 'link' || customResult) {
             if (type === 'link') {
                 const cellValue = value;
+                const cellOriginValue = table.getCellOriginValue(col, row);
                 const headerStyle = table._getCellStyle(col, row);
                 if (type === 'link' &&
                     (('templateLink' in define && define.templateLink) ||
-                        !('linkDetect' in define && define.linkDetect) ||
+                        !('linkDetect' in define &&
+                            getOrApply(define.linkDetect, {
+                                col,
+                                row,
+                                table,
+                                value: cellValue,
+                                dataValue: cellOriginValue,
+                                cellHeaderPaths: undefined
+                            })) ||
                         regUrl.test(cellValue))) {
                     if (cellTheme) {
                         cellTheme.text.fill = getProp('linkColor', headerStyle, col, row, table);
@@ -37142,30 +37157,7 @@
                     }
                 }
             }
-            let customElementsGroup;
-            let renderDefault = true;
-            if (customResult) {
-                customElementsGroup = customResult.elementsGroup;
-                renderDefault = customResult.renderDefault;
-            }
-            else {
-                let customRender;
-                let customLayout;
-                const cellLocation = table.getCellLocation(col, row);
-                if (cellLocation !== 'body') {
-                    customRender = define?.headerCustomRender;
-                    customLayout = define?.headerCustomLayout;
-                }
-                else {
-                    customRender = define?.customRender || table.customRender;
-                    customLayout = define?.customLayout;
-                }
-                if (customLayout || customRender) {
-                    const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, false, table.isAutoRowHeight(row), padding, range, table);
-                    customElementsGroup = customResult.elementsGroup;
-                    renderDefault = customResult.renderDefault;
-                }
-            }
+            const { customElementsGroup, renderDefault } = _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult);
             const createTextCellGroup = Factory.getFunction('createTextCellGroup');
             cellGroup = createTextCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme, range, isAsync);
             const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
@@ -37201,10 +37193,11 @@
             cellGroup = createChartCellGroup(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, value, define.chartModule, table.internalProps.layoutMap.getChartSpec(col, row), chartInstance, table.internalProps.layoutMap.getChartDataId(col, row) ?? 'data', table, cellTheme, table.internalProps.layoutMap.isShareChartSpec(col, row), isAsync, table.internalProps.layoutMap.isNoChartDataRenderNothing(col, row));
         }
         else if (type === 'progressbar') {
+            const { customElementsGroup, renderDefault } = _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult);
             const style = table._getCellStyle(col, row);
             const dataValue = table.getCellOriginValue(col, row);
             const createTextCellGroup = Factory.getFunction('createTextCellGroup');
-            cellGroup = createTextCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, false, null, true, cellTheme, range, isAsync);
+            cellGroup = createTextCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, false, customElementsGroup, renderDefault, cellTheme, range, isAsync);
             const createProgressBarCell = Factory.getFunction('createProgressBarCell');
             const progressBarGroup = createProgressBarCell(define, style, colWidth, value, dataValue, col, row, padding, table, range);
             if (cellGroup.firstChild) {
@@ -37229,6 +37222,36 @@
         cellGroup.onBeforeAttributeUpdate = onBeforeAttributeUpdateForInvertHighlight;
         return cellGroup;
     }
+    function _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult) {
+        let customElementsGroup;
+        let renderDefault = true;
+        if (customResult) {
+            customElementsGroup = customResult.elementsGroup;
+            renderDefault = customResult.renderDefault;
+        }
+        else {
+            let customRender;
+            let customLayout;
+            const cellLocation = table.getCellLocation(col, row);
+            if (cellLocation !== 'body') {
+                customRender = define?.headerCustomRender;
+                customLayout = define?.headerCustomLayout;
+            }
+            else {
+                customRender = define?.customRender || table.customRender;
+                customLayout = define?.customLayout;
+            }
+            if (customLayout || customRender) {
+                const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, false, table.isAutoRowHeight(row), padding, range, table);
+                customElementsGroup = customResult.elementsGroup;
+                renderDefault = customResult.renderDefault;
+            }
+        }
+        return {
+            customElementsGroup,
+            renderDefault
+        };
+    }
     function updateCell$1(col, row, table, addNew, isShadow, forceFastUpdate) {
         const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);
         const cellLocation = table.getCellLocation(col, row);
@@ -37794,6 +37817,11 @@
             const { fontSize, fontFamily = 'Arial,sans-serif', fontWeight = 'normal', fontStyle = 'normal' } = options;
             const fastTextMeasure = getFastTextMeasure(fontSize, fontWeight, fontFamily, fontStyle);
             const textMeasure = fastTextMeasure.measure(text, textMeasureMode);
+            if (!isValid$3(textMeasure.fontBoundingBoxAscent) && !isValid$3(textMeasure.fontBoundingBoxDescent)) {
+                const { ascent, descent } = this.measureTextBoundADscentEstimate(options);
+                textMeasure.fontBoundingBoxAscent = ascent;
+                textMeasure.fontBoundingBoxDescent = descent;
+            }
             return textMeasure;
         }
         measureTextWidth(text, options) {
@@ -40595,6 +40623,10 @@
             ? group.border.attribute.strokeArrayWidth[3]
             : group.border.attribute.lineWidth ?? 0;
         group.border.setAttributes({
+            borderLeft,
+            borderTop,
+            borderRight,
+            borderBottom,
             width: group.attribute.width - borderLeft / 2 - borderRight / 2,
             height: group.attribute.height - borderTop / 2 - borderBottom / 2
         });
@@ -43799,7 +43831,13 @@
             return;
         }
         containerGroup.setAttribute('width', lastColGroup.attribute.x + lastColGroup.attribute.width);
-        containerGroup.border?.setAttribute('width', lastColGroup.attribute.x + lastColGroup.attribute.width);
+        if (containerGroup.border) {
+            const border = containerGroup.border;
+            border.setAttribute('width', lastColGroup.attribute.x +
+                lastColGroup.attribute.width -
+                (border.attribute.borderLeft ?? 0) / 2 -
+                (border.attribute.borderRight ?? 0) / 2);
+        }
     }
 
     function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table, direction = 'up', part) {
@@ -44119,9 +44157,30 @@
                 proxy.updateCellGroupContent(cellGroup);
             }
         }
+        updateColumnContainerHeight(proxy.table.scenegraph.rowHeaderGroup);
+        updateColumnContainerHeight(proxy.table.scenegraph.rightFrozenGroup);
+        updateColumnContainerHeight(proxy.table.scenegraph.bodyGroup);
         proxy.table.scenegraph.updateNextFrame();
         return sync;
     }
+    function updateColumnContainerHeight(containerGroup) {
+        const lastColGroup = getLastChild(containerGroup);
+        if (!lastColGroup) {
+            return;
+        }
+        const lastCellGroup = getLastChild(lastColGroup);
+        if (!lastCellGroup) {
+            return;
+        }
+        containerGroup.setAttribute('height', lastCellGroup.attribute.y + lastCellGroup.attribute.height);
+        if (containerGroup.border) {
+            const border = containerGroup.border;
+            border.setAttribute('height', lastCellGroup.attribute.y +
+                lastCellGroup.attribute.height -
+                (border.attribute.borderTop ?? 0) / 2 -
+                (border.attribute.borderBottom ?? 0) / 2);
+        }
+    }
 
     async function sortVertical(proxy) {
         proxy.table.scenegraph.bodyGroup.forEachChildren((colGroup, index) => {
@@ -49001,6 +49060,16 @@
                     : this.table.theme.bodyStyle.frameStyle, this.rowHeaderGroup.role, isListTableWithFrozen ? [true, false, true, true] : undefined);
             createFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle, this.colHeaderGroup.role, isListTableWithFrozen ? [true, true, true, false] : undefined);
             createFrameBorder(this.cornerHeaderGroup, this.isPivot ? this.table.theme.cornerHeaderStyle.frameStyle : this.table.theme.headerStyle.frameStyle, this.cornerHeaderGroup.role, isListTableWithFrozen ? [true, false, true, true] : undefined);
+            this.table.theme.cornerLeftBottomCellStyle?.frameStyle &&
+                createFrameBorder(this.leftBottomCornerGroup, this.table.theme.cornerLeftBottomCellStyle.frameStyle, this.leftBottomCornerGroup.role, isListTableWithFrozen ? [true, false, true, true] : undefined);
+            this.table.theme.bottomFrozenStyle?.frameStyle &&
+                createFrameBorder(this.bottomFrozenGroup, this.table.theme.bottomFrozenStyle.frameStyle, this.bottomFrozenGroup.role, isListTableWithFrozen ? [true, true, true, false] : undefined);
+            this.table.theme.rightFrozenStyle?.frameStyle &&
+                createFrameBorder(this.rightFrozenGroup, this.table.theme.rightFrozenStyle.frameStyle, this.rightFrozenGroup.role, undefined);
+            this.table.theme.cornerRightTopCellStyle?.frameStyle &&
+                createFrameBorder(this.rightTopCornerGroup, this.table.theme.cornerRightTopCellStyle.frameStyle, this.rightTopCornerGroup.role, undefined);
+            this.table.theme.cornerRightBottomCellStyle?.frameStyle &&
+                createFrameBorder(this.rightBottomCornerGroup, this.table.theme.cornerRightBottomCellStyle.frameStyle, this.rightBottomCornerGroup.role, undefined);
             createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role, undefined);
         }
         getResizeColAt(abstractX, abstractY, cellGroup) {
@@ -49126,6 +49195,26 @@
                 this.cornerHeaderGroup.appendChild(this.cornerHeaderGroup.border);
                 updateFrameBorderSize(this.cornerHeaderGroup);
             }
+            if (this.leftBottomCornerGroup.border) {
+                this.leftBottomCornerGroup.appendChild(this.leftBottomCornerGroup.border);
+                updateFrameBorderSize(this.leftBottomCornerGroup);
+            }
+            if (this.bottomFrozenGroup.border) {
+                this.bottomFrozenGroup.appendChild(this.bottomFrozenGroup.border);
+                updateFrameBorderSize(this.bottomFrozenGroup);
+            }
+            if (this.rightFrozenGroup.border) {
+                this.rightFrozenGroup.appendChild(this.rightFrozenGroup.border);
+                updateFrameBorderSize(this.rightFrozenGroup);
+            }
+            if (this.rightTopCornerGroup.border) {
+                this.rightTopCornerGroup.appendChild(this.rightTopCornerGroup.border);
+                updateFrameBorderSize(this.rightTopCornerGroup);
+            }
+            if (this.rightBottomCornerGroup.border) {
+                this.rightBottomCornerGroup.appendChild(this.rightBottomCornerGroup.border);
+                updateFrameBorderSize(this.rightBottomCornerGroup);
+            }
             updateCornerRadius(this.table);
         }
         sortCell() {
@@ -49144,19 +49233,7 @@
                 if (text.attribute.moreThanMaxCharacters) {
                     return this.table.getCellValue(col, row);
                 }
-                const textAttributeStr = isArray$7(text.attribute.text)
-                    ? text.attribute.text.join('')
-                    : text.attribute.text;
-                let cacheStr = '';
-                if (isString$4(text.cache.clipedText)) {
-                    cacheStr = text.cache.clipedText;
-                }
-                else {
-                    text.cache.layoutData?.lines?.forEach((line) => {
-                        cacheStr += line.str;
-                    });
-                }
-                if (cacheStr !== textAttributeStr) {
+                if (text.cliped) {
                     return this.table.getCellValue(col, row);
                 }
             }
@@ -50822,7 +50899,7 @@
                 else {
                     state.headerCheckedState[hd.field] = headerChecked;
                 }
-                if (hd.define.cellType === 'checkbox' && !hd.fieldFormat) {
+                if ((hd.define.cellType === 'checkbox' || isFunction$5(hd.define.cellType)) && !hd.fieldFormat) {
                     state._checkboxCellTypeFields.push(hd.field);
                 }
             }
@@ -52048,10 +52125,10 @@
                 }
             }
         }
-        setDropDownMenuHighlight(cells) {
-            this.menu.dropDownMenuHighlight = cells;
-            for (let i = 0; i < cells.length; i++) {
-                const { col, row } = cells[i];
+        setDropDownMenuHighlight(dropDownMenuInfo) {
+            this.menu.dropDownMenuHighlight = dropDownMenuInfo;
+            for (let i = 0; i < dropDownMenuInfo.length; i++) {
+                const { col, row } = dropDownMenuInfo[i];
                 const range = this.table.getCellRange(col, row);
                 if (!range) {
                     continue;
@@ -52326,16 +52403,32 @@
                 const cellValue = table.getCellValue(col, row);
                 const cellOriginValue = table.getCellOriginValue(col, row);
                 if (cellType === 'link') {
-                    const linkJump = columnDefine.linkJump !== false;
+                    let linkJump = getOrApply(columnDefine.linkJump, {
+                        col,
+                        row,
+                        table,
+                        value: cellValue,
+                        dataValue: cellOriginValue,
+                        cellHeaderPaths: undefined
+                    });
+                    linkJump = linkJump !== false;
                     if (!linkJump) {
                         return;
                     }
                     const templateLink = columnDefine.templateLink;
-                    const linkDetect = columnDefine.linkDetect !== false;
+                    let linkDetect = getOrApply(columnDefine.linkDetect, {
+                        col,
+                        row,
+                        table,
+                        value: cellValue,
+                        dataValue: cellOriginValue,
+                        cellHeaderPaths: undefined
+                    });
+                    linkDetect = linkDetect !== false;
                     let url;
                     if (templateLink) {
                         const rowData = table.getCellOriginRecord(col, row);
-                        if (rowData.vtableMerge) {
+                        if (rowData && rowData.vtableMerge) {
                             return;
                         }
                         const data = Object.assign({
@@ -52750,6 +52843,9 @@
             }
             eventManager.dealIconHover(eventArgsSet);
             eventManager.dealTableHover(eventArgsSet);
+            if (table.theme.columnResize.visibleOnHover) {
+                eventManager.checkColumnResize(eventArgsSet, true);
+            }
             if (eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.MOUSEMOVE_CELL)) {
                 let icon;
                 let position;
@@ -54730,7 +54826,9 @@
                     if (this.table.eventManager.checkCellFillhandle(eventArgsSet)) {
                         this.table.fireListeners(TABLE_EVENT_TYPE.DBLCLICK_FILL_HANDLE, {});
                     }
-                    else if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {
+                    else if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) &&
+                        resizeCol.col >= 0 &&
+                        !this.table.options.disableDblclickAutoResizeColWidth) {
                         this.table.scenegraph.updateAutoColWidth(resizeCol.col);
                         this.table.internalProps._widthResizedColMap.add(resizeCol.col);
                         this.table.scenegraph.updateChartSizeForResizeColWidth(resizeCol.col);
@@ -54895,6 +54993,9 @@
                 }
                 return true;
             }
+            if (this.table.stateManager.isResizeCol()) {
+                this.table.stateManager.endResizeCol();
+            }
             return false;
         }
         checkRowResize(eventArgsSet, update) {
@@ -59498,7 +59599,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.16.0-alpha.1";
+        version = "1.16.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -64438,7 +64539,9 @@
                 }
                 if (row < this.headerLevelCount) {
                     return Object.assign({}, this.leftRowSeriesNumberColumn[col], {
-                        style: this._table.internalProps.rowSeriesNumber.headerStyle
+                        style: Object.assign({}, this._table.transpose
+                            ? this._table.internalProps.theme.rowHeaderStyle
+                            : this._table.internalProps.theme.headerStyle, this._table.internalProps.rowSeriesNumber.headerStyle)
                     });
                 }
             }
@@ -66968,7 +67071,7 @@
             return null;
         }
         getHierarchyState(col, row) {
-            if (!this.options.groupBy) {
+            if (!this.options.groupBy || (isArray$7(this.options.groupBy) && this.options.groupBy.length === 0)) {
                 const define = this.getBodyColumnDefine(col, row);
                 if (!define.tree) {
                     return HierarchyState.none;
@@ -67134,7 +67237,8 @@
                 this.stateManager.initLeftRecordsCheckState(this.records);
             }
             if (isValid$3(field)) {
-                let stateArr = this.stateManager.checkedState.values();
+                const keys = Array.from(this.stateManager.checkedState.keys()).sort();
+                let stateArr = keys.map(key => this.stateManager.checkedState.get(key));
                 if (this.options.groupBy) {
                     stateArr = getGroupCheckboxState(this);
                 }
@@ -73717,15 +73821,19 @@
             }
         }
         _addCornerHeaders(colDimensionKeys, rowDimensionKeys, dimensions) {
+            this._cornerHeaderCellFullPathIds = [];
             const results = [];
+            const colLevelCount = this.columnHierarchyType === 'grid-tree'
+                ? this._getColumnHeaderTreeExpandedMaxLevelCount() || this.columnHeaderLevelCount
+                : this.columnHeaderLevelCount;
+            const rowLevelCount = this.rowHierarchyType === 'grid-tree'
+                ? this._getRowHeaderTreeExpandedMaxLevelCount() || this.rowHeaderLevelCount
+                : this.rowHeaderLevelCount;
             if (this.cornerSetting.titleOnDimension === 'all') {
                 if (this.indicatorsAsCol) {
-                    let indicatorAtIndex = -1;
                     if (colDimensionKeys) {
-                        colDimensionKeys.forEach((dimensionKey, key) => {
-                            if (dimensionKey === this.indicatorDimensionKey) {
-                                indicatorAtIndex = key;
-                            }
+                        for (let i = 0; i < colLevelCount; i++) {
+                            const dimensionKey = colDimensionKeys[i];
                             const id = ++this.sharedVar.seqId;
                             const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === dimensionKey);
                             const cell = {
@@ -73763,16 +73871,17 @@
                             };
                             results[id] = cell;
                             this._headerObjects[id] = cell;
-                            if (!this._cornerHeaderCellFullPathIds[key]) {
-                                this._cornerHeaderCellFullPathIds[key] = [];
+                            if (!this._cornerHeaderCellFullPathIds[i]) {
+                                this._cornerHeaderCellFullPathIds[i] = [];
                             }
-                            for (let r = 0; r < this.rowHeaderLevelCount; r++) {
-                                this._cornerHeaderCellFullPathIds[key][r] = id;
+                            for (let r = 0; r < rowLevelCount; r++) {
+                                this._cornerHeaderCellFullPathIds[i][r] = id;
                             }
-                        });
+                        }
                     }
                     if (rowDimensionKeys) {
-                        rowDimensionKeys.forEach((dimensionKey, key) => {
+                        for (let i = 0; i < rowLevelCount; i++) {
+                            const dimensionKey = rowDimensionKeys[i];
                             const id = ++this.sharedVar.seqId;
                             const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === dimensionKey);
                             const cell = {
@@ -73810,20 +73919,17 @@
                             };
                             results[id] = cell;
                             this._headerObjects[id] = cell;
-                            if (!this._cornerHeaderCellFullPathIds[indicatorAtIndex]) {
-                                this._cornerHeaderCellFullPathIds[indicatorAtIndex] = [];
+                            if (!this._cornerHeaderCellFullPathIds[this._cornerHeaderCellFullPathIds.length - 1]) {
+                                this._cornerHeaderCellFullPathIds[this._cornerHeaderCellFullPathIds.length - 1] = [];
                             }
-                            this._cornerHeaderCellFullPathIds[indicatorAtIndex][key] = id;
-                        });
+                            this._cornerHeaderCellFullPathIds[this._cornerHeaderCellFullPathIds.length - 1][i] = id;
+                        }
                     }
                 }
                 else {
-                    let indicatorAtIndex = -1;
                     if (rowDimensionKeys) {
-                        rowDimensionKeys.forEach((dimensionKey, key) => {
-                            if (dimensionKey === this.indicatorDimensionKey) {
-                                indicatorAtIndex = key;
-                            }
+                        for (let i = 0; i < rowLevelCount; i++) {
+                            const dimensionKey = rowDimensionKeys[i];
                             const id = ++this.sharedVar.seqId;
                             const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === dimensionKey);
                             const cell = {
@@ -73861,16 +73967,17 @@
                             };
                             results[id] = cell;
                             this._headerObjects[id] = cell;
-                            for (let r = 0; r < this.columnHeaderLevelCount; r++) {
+                            for (let r = 0; r < colLevelCount; r++) {
                                 if (!this._cornerHeaderCellFullPathIds[r]) {
                                     this._cornerHeaderCellFullPathIds[r] = [];
                                 }
-                                this._cornerHeaderCellFullPathIds[r][key] = id;
+                                this._cornerHeaderCellFullPathIds[r][i] = id;
                             }
-                        });
+                        }
                     }
                     if (colDimensionKeys) {
-                        colDimensionKeys.forEach((dimensionKey, key) => {
+                        for (let c = 0; c < colLevelCount; c++) {
+                            const dimensionKey = colDimensionKeys[c];
                             const id = ++this.sharedVar.seqId;
                             const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === dimensionKey);
                             const cell = {
@@ -73908,8 +74015,8 @@
                             };
                             results[id] = cell;
                             this._headerObjects[id] = cell;
-                            this._cornerHeaderCellFullPathIds[key][indicatorAtIndex] = id;
-                        });
+                            this._cornerHeaderCellFullPathIds[c][this._cornerHeaderCellFullPathIds[c].length - 1] = id;
+                        }
                     }
                 }
             }
@@ -75002,6 +75109,7 @@
             else if (this.rowHierarchyType === 'grid-tree') {
                 const startRow = 0;
                 this._addHeadersForGridTreeMode(this._rowHeaderCellFullPathIds_FULL, startRow, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, this._getRowHeaderTreeExpandedMaxLevelCount(), true, this.rowsDefine, this.rowHeaderObjs, true);
+                this.cornerHeaderObjs = this._addCornerHeaders(this.colDimensionKeys, this.rowDimensionKeys, this.columnsDefine.concat(...this.rowsDefine));
             }
             if (this.rowHeaderTitle) {
                 const id = ++this.sharedVar.seqId;
@@ -75075,6 +75183,7 @@
             if (this.columnHierarchyType === 'grid-tree') {
                 const startRow = 0;
                 this._addHeadersForGridTreeMode(this._columnHeaderCellFullPathIds, startRow, this.columnDimensionTree.tree.children, [], this.columnDimensionTree.totalLevel, this._getColumnHeaderTreeExpandedMaxLevelCount(), true, this.columnsDefine, this.columnHeaderObjs, false);
+                this.cornerHeaderObjs = this._addCornerHeaders(this.colDimensionKeys, this.rowDimensionKeys, this.columnsDefine.concat(...this.rowsDefine));
             }
             if (this.columnHeaderTitle) {
                 const id = ++this.sharedVar.seqId;
@@ -76197,7 +76306,7 @@
             if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && col < this.leftRowSeriesNumberColumnCount) {
                 if (row < this.headerLevelCount) {
                     return Object.assign({}, this.leftRowSeriesNumberColumn[col], {
-                        style: this._table.internalProps.rowSeriesNumber.headerStyle
+                        style: Object.assign({}, this._table.internalProps.theme.cornerHeaderStyle, this._table.internalProps.rowSeriesNumber.headerStyle)
                     });
                 }
             }
@@ -76822,7 +76931,7 @@
                             return this.rowsHasValue[index];
                         }), this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
                             (!this.indicatorsAsCol && this.columns.length === 0) ||
-                            (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel);
+                            (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false);
                     }
                     else {
                         this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter((key, index) => {
@@ -77346,7 +77455,7 @@
                         return this.rowsHasValue[index];
                     }), this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
                         (!this.indicatorsAsCol && this.columns.length === 0) ||
-                        (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel);
+                        (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false);
                 }
                 else {
                     this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter((key, index) => {
@@ -77870,11 +77979,11 @@
                 }
             }
         }
-        ArrToTree1(arr, rows, indicators, isGrandTotal, grandTotalLabel) {
+        ArrToTree1(arr, rows, indicators, isGrandTotal, grandTotalLabel, showGrandTotalsOnTop) {
             const result = [];
             const concatStr = this.stringJoinChar;
             const map = new Map();
-            function addList(list) {
+            function addList(list, isGrandTotal) {
                 const path = [];
                 let node;
                 list.forEach((value, index) => {
@@ -77905,15 +78014,20 @@
                             node.children.push(item);
                         }
                         else {
-                            result.push(item);
+                            if (showGrandTotalsOnTop && isGrandTotal) {
+                                result.unshift(item);
+                            }
+                            else {
+                                result.push(item);
+                            }
                         }
                     }
                     node = item;
                 });
             }
-            arr.forEach(item => addList(item));
+            arr.forEach(item => addList(item, false));
             if (isGrandTotal) {
-                addList([grandTotalLabel]);
+                addList([grandTotalLabel], isGrandTotal);
             }
             return result;
         }
@@ -81458,7 +81572,7 @@
     }
 
     registerForVrender();
-    const version = "1.16.0-alpha.1";
+    const version = "1.16.1";
     function getIcons() {
         return get$2();
     }