@visactor/vtable 1.17.6-alpha.3 → 1.17.7-alpha.0

package/dist/vtable.js

@@ -29057,7 +29057,8 @@
         DBLCLICK_FILL_HANDLE: 'dblclick_fill_handle',
         EMPTY_TIP_CLICK: 'empty_tip_click',
         EMPTY_TIP_DBLCLICK: 'empty_tip_dblclick',
-        BUTTON_CLICK: 'button_click'
+        BUTTON_CLICK: 'button_click',
+        BEFORE_CACHE_CHART_IMAGE: 'before_cache_chart_image'
     };
 
     const judgeType = (value) => {
@@ -41457,6 +41458,7 @@
                 chartInstance.updateFullDataSync?.(dataBatch);
             }
         }
+        table.fireListeners('before_cache_chart_image', { chartInstance });
         const sg = chartInstance.getStage();
         cacheStageCanvas(sg, chart);
     }
@@ -42705,7 +42707,7 @@
                     context.stroke();
                 }
                 else {
-                    renderStroke(rect, context, x, y, rectAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, Math.ceil(width + deltaWidth), Math.ceil(height + deltaHeight));
+                    renderStroke(rect, context, x, y, rectAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, rect.name !== 'table-border-rect' ? Math.ceil(width + deltaWidth) : width + deltaWidth, rect.name !== 'table-border-rect' ? Math.ceil(height + deltaHeight) : height + deltaHeight);
                 }
             }
         }
@@ -43928,10 +43930,14 @@
             computeRowsHeight(table, 0, table.options.canvasHeight === 'auto' ? table.rowCount - 1 : distRowForCompute ?? distRow);
         }
         if (distCol < table.colCount - table.rightFrozenColCount) {
-            computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1);
+            if (table.colCount - table.rightFrozenColCount <= table.colCount - 1) {
+                computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1);
+            }
         }
         if (distRow < table.rowCount - table.bottomFrozenRowCount) {
-            computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1);
+            if (table.rowCount - table.bottomFrozenRowCount <= table.rowCount - 1) {
+                computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1);
+            }
         }
         table.scenegraph.colHeaderGroup.setAttribute('x', table.getFrozenColsWidth());
         table.scenegraph.rowHeaderGroup.setAttribute('y', table.getFrozenRowsHeight());
@@ -45260,7 +45266,9 @@
         }
         createColGroup(onceCount) {
             const endCol = Math.min(this.totalCol, this.currentCol + onceCount);
-            computeColsWidth(this.table, this.currentCol + 1, endCol);
+            if (this.table.widthMode !== 'adaptive') {
+                computeColsWidth(this.table, this.currentCol + 1, endCol);
+            }
             this.colEnd = endCol;
             for (let row = 0; row < this.table.rowCount; row++) {
                 const cellGroup = this.highPerformanceGetCell(this.currentCol, row);
@@ -45410,7 +45418,9 @@
         }
         updateColGroups(count) {
             const distCol = Math.min(this.bodyRightCol, this.colUpdatePos + count);
-            computeColsWidth(this.table, this.colUpdatePos, distCol);
+            if (this.table.widthMode === 'autoWidth') {
+                computeColsWidth(this.table, this.colUpdatePos, distCol);
+            }
             updateColContent(this.colUpdatePos, distCol, this);
             this.colUpdatePos = distCol + 1;
         }
@@ -50390,7 +50400,8 @@
                 }
                 else if (table.internalProps.layoutMap.isSeriesNumberInHeader(col, row)) {
                     extendSelectRange = false;
-                    if (state.select.headerSelectMode === 'body') {
+                    const { cornerHeaderSelectMode } = state.select;
+                    if (cornerHeaderSelectMode === 'body') {
                         state.select.ranges.push({
                             start: {
                                 col: table.leftRowSeriesNumberCount,
@@ -50400,6 +50411,22 @@
                             skipBodyMerge: true
                         });
                     }
+                    else if (cornerHeaderSelectMode === 'inline') {
+                        const cellRange = skipBodyMerge ? { start: { col, row }, end: { col, row } } : table.getCellRange(col, row);
+                        state.select.ranges.push({
+                            start: { col: cellRange.start.col, row: cellRange.start.row },
+                            end: { col: cellRange.end.col, row: table.rowCount - 1 },
+                            skipBodyMerge: true
+                        });
+                    }
+                    else if (cornerHeaderSelectMode === 'cell') {
+                        const cellRange = skipBodyMerge ? { start: { col, row }, end: { col, row } } : table.getCellRange(col, row);
+                        state.select.ranges.push({
+                            start: { col: cellRange.start.col, row: cellRange.start.row },
+                            end: { col: cellRange.end.col, row: cellRange.end.row },
+                            skipBodyMerge: skipBodyMerge || undefined
+                        });
+                    }
                     else {
                         state.select.ranges.push({
                             start: { col: 0, row: 0 },
@@ -50430,7 +50457,8 @@
                 }
                 else if (table.internalProps.layoutMap.isCornerHeader(col, row)) {
                     extendSelectRange = false;
-                    if (state.select.headerSelectMode === 'body') {
+                    const { cornerHeaderSelectMode } = state.select;
+                    if (cornerHeaderSelectMode === 'body') {
                         state.select.ranges.push({
                             start: {
                                 col: table.rowHeaderLevelCount + table.leftRowSeriesNumberCount,
@@ -50440,9 +50468,38 @@
                             skipBodyMerge: true
                         });
                     }
+                    else if (cornerHeaderSelectMode === 'cell') {
+                        const cellRange = skipBodyMerge ? { start: { col, row }, end: { col, row } } : table.getCellRange(col, row);
+                        state.select.ranges.push({
+                            start: { col: cellRange.start.col, row: cellRange.start.row },
+                            end: { col: cellRange.end.col, row: cellRange.end.row },
+                            skipBodyMerge: skipBodyMerge || undefined
+                        });
+                    }
+                    else if (cornerHeaderSelectMode === 'inline') {
+                        const cellRange = skipBodyMerge ? { start: { col, row }, end: { col, row } } : table.getCellRange(col, row);
+                        state.select.ranges.push({
+                            start: { col: cellRange.start.col, row: cellRange.start.row },
+                            end: { col: cellRange.end.col, row: table.rowCount - 1 },
+                            skipBodyMerge: true
+                        });
+                    }
+                    else if (cornerHeaderSelectMode === 'all') {
+                        state.select.ranges.push({
+                            start: {
+                                col: table.leftRowSeriesNumberCount,
+                                row: 0
+                            },
+                            end: { col: table.colCount - 1, row: table.rowCount - 1 },
+                            skipBodyMerge: true
+                        });
+                    }
                     else {
                         state.select.ranges.push({
-                            start: { col: table.leftRowSeriesNumberCount, row: 0 },
+                            start: {
+                                col: table.leftRowSeriesNumberCount,
+                                row: 0
+                            },
                             end: { col: table.colCount - 1, row: table.rowCount - 1 },
                             skipBodyMerge: true
                         });
@@ -51419,7 +51476,7 @@
         const recordIndex = state.table.getRecordShowIndexByCell(col, row);
         if (recordIndex >= 0) {
             const dataIndex = state.table.dataSource.getIndexKey(recordIndex).toString();
-            if (state.checkedState.has(dataIndex)) {
+            if (state.checkedState.get(dataIndex)) {
                 state.checkedState.get(dataIndex)[field] = checked;
             }
             else {
@@ -51458,7 +51515,7 @@
             if (isValid$3(state.checkedState.get(dataIndex)?.[field])) {
                 return state.checkedState.get(dataIndex)[field];
             }
-            if (state.checkedState.has(dataIndex)) {
+            if (state.checkedState.get(dataIndex)) {
                 state.checkedState.get(dataIndex)[field] = checked;
             }
             else if (dataIndex.includes(',')) {
@@ -52133,6 +52190,11 @@
                 highlightMode: 'cell',
                 highlightInRange: false
             }, this.table.options.select);
+            const cornerHeaderSelectMode = this.table.options.select?.cornerHeaderSelectMode
+                ? this.table.options.select?.cornerHeaderSelectMode
+                : this.table.options.select?.headerSelectMode === 'body'
+                    ? this.table.options.select?.headerSelectMode
+                    : 'all';
             if (disableSelect === true) {
                 this.select.highlightScope = HighlightScope.none;
             }
@@ -52153,6 +52215,7 @@
             this.select.singleStyle = !disableSelect;
             this.select.disableHeader = disableHeaderSelect;
             this.select.headerSelectMode = headerSelectMode;
+            this.select.cornerHeaderSelectMode = cornerHeaderSelectMode;
             this.select.highlightInRange = highlightInRange;
             this.select.disableCtrlMultiSelect = this.table.options.keyboardOptions?.ctrlMultiSelect === false;
         }
@@ -54008,7 +54071,8 @@
                 }
                 const hitIcon = e.target.role?.startsWith('icon') ? e.target : undefined;
                 eventManager.downIcon = hitIcon;
-                if (!hitIcon &&
+                if (e.pointerType !== 'touch' &&
+                    !hitIcon &&
                     !eventManager.checkCellFillhandle(eventArgsSet) &&
                     !stateManager.columnResize.resizing &&
                     eventManager.checkColumnResize(eventArgsSet, true)) {
@@ -55114,7 +55178,7 @@
                         table.stateManager.updateInteractionState(InteractionState.grabing);
                         const targetCol = table.getTargetColAtConsiderRightFrozen(selectX, considerFrozenX);
                         const targetRow = table.getTargetRowAtConsiderBottomFrozen(selectY, considerFrozenY);
-                        if (isValid$3(targetCol) && isValid$3(targetRow)) {
+                        if (!table.options.select?.disableDragSelect && isValid$3(targetCol) && isValid$3(targetRow)) {
                             table.stateManager.updateSelectPos(targetCol.col, targetRow.row, false, false, false, false);
                         }
                     });
@@ -60588,7 +60652,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.17.6-alpha.3";
+        version = "1.17.7-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -65429,6 +65493,8 @@
         _hasAggregationOnTopCount = 0;
         _hasAggregationOnBottomCount = 0;
         rowHierarchyType;
+        columnHierarchyType;
+        columnExpandLevel;
         _cellRangeMap;
         constructor(table, columns, showHeader, hierarchyIndent) {
             this._cellRangeMap = new Map();
@@ -65439,7 +65505,9 @@
             this._headerCellIds = [];
             this.hierarchyIndent = hierarchyIndent ?? 20;
             this.hierarchyTextStartAlignment = table.options.hierarchyTextStartAlignment;
-            this.columnTree = new DimensionTree(columns, { seqId: 0 }, null);
+            this.columnHierarchyType = table.options.headerHierarchyType;
+            this.columnExpandLevel = table.options.headerExpandLevel ?? 1;
+            this.columnTree = new DimensionTree(columns, { seqId: 0 }, this.columnHierarchyType ?? null, this.columnHierarchyType === 'grid-tree' ? this.columnExpandLevel : undefined);
             this._headerObjectsIncludeHided = this._addHeaders(0, columns, []);
             this._headerObjects = this._headerObjectsIncludeHided.filter(col => {
                 return col.define.hide !== true;
@@ -66235,6 +66303,7 @@
                     headerType: hd.headerType ?? 'text',
                     dropDownMenu: hd.dropDownMenu,
                     define: hd,
+                    hierarchyState: hd.hierarchyState,
                     columnWidthComputeMode: hd.columnWidthComputeMode
                 };
                 results[id] = cell;
@@ -66247,7 +66316,8 @@
                 else if (this._headerCellIds[row - 1]) {
                     rowCells[col] = this._headerCellIds[row - 1][col];
                 }
-                if (hd.columns) {
+                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));
@@ -68125,6 +68195,9 @@
             return null;
         }
         getHierarchyState(col, row) {
+            if (this.isHeader(col, row)) {
+                return this._getHeaderLayoutMap(col, row)?.hierarchyState;
+            }
             if (!this.options.groupBy || (isArray$7(this.options.groupBy) && this.options.groupBy.length === 0)) {
                 const define = this.getBodyColumnDefine(col, row);
                 if (!define.tree) {
@@ -68137,6 +68210,28 @@
         toggleHierarchyState(col, row, recalculateColWidths = true) {
             this.stateManager.updateHoverIcon(col, row, undefined, undefined);
             const hierarchyState = this.getHierarchyState(col, row);
+            if (this.isHeader(col, row)) {
+                const headerTreeNode = this.internalProps.layoutMap.getHeader(col, row);
+                const { hierarchyState: rawHierarchyState, define: columnDefine } = headerTreeNode;
+                if (![HierarchyState.collapse, HierarchyState.expand].includes(rawHierarchyState) || !columnDefine) {
+                    return;
+                }
+                const children = columnDefine.columns;
+                if (!!Array.isArray(children) && children.length > 0) {
+                    const hierarchyState = rawHierarchyState === HierarchyState.expand ? HierarchyState.collapse : HierarchyState.expand;
+                    headerTreeNode.hierarchyState = hierarchyState;
+                    headerTreeNode.define.hierarchyState = hierarchyState;
+                    this.updateColumns(this.internalProps.columns);
+                }
+                this.fireListeners(TABLE_EVENT_TYPE.TREE_HIERARCHY_STATE_CHANGE, {
+                    col,
+                    row,
+                    hierarchyState,
+                    originData: headerTreeNode,
+                    cellLocation: this.getCellLocation(col, row)
+                });
+                return;
+            }
             if (hierarchyState === HierarchyState.expand) {
                 this._refreshHierarchyState(col, row, recalculateColWidths);
                 this.fireListeners(TABLE_EVENT_TYPE.TREE_HIERARCHY_STATE_CHANGE, {
@@ -83409,7 +83504,7 @@
     }
 
     registerForVrender();
-    const version = "1.17.6-alpha.3";
+    const version = "1.17.7-alpha.0";
     function getIcons() {
         return get$2();
     }