@visactor/vtable 1.16.0 → 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;
                     }
                 };
             }
@@ -37152,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);
@@ -37211,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) {
@@ -37239,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);
@@ -40610,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
         });
@@ -43814,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) {
@@ -44134,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) => {
@@ -49016,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) {
@@ -49141,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() {
@@ -52051,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;
@@ -52769,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;
@@ -54749,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);
@@ -54914,6 +54993,9 @@
                 }
                 return true;
             }
+            if (this.table.stateManager.isResizeCol()) {
+                this.table.stateManager.endResizeCol();
+            }
             return false;
         }
         checkRowResize(eventArgsSet, update) {
@@ -59517,7 +59599,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.16.0";
+        version = "1.16.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -66989,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;
@@ -67155,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);
                 }
@@ -76848,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) => {
@@ -77372,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) => {
@@ -77896,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) => {
@@ -77931,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;
         }
@@ -81484,7 +81572,7 @@
     }
 
     registerForVrender();
-    const version = "1.16.0";
+    const version = "1.16.1";
     function getIcons() {
         return get$2();
     }