@visactor/vtable 1.17.6-alpha.2 → 1.17.6

package/dist/vtable.js

@@ -42705,7 +42705,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);
                 }
             }
         }
@@ -50398,7 +50398,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,
@@ -50408,6 +50409,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 },
@@ -50438,7 +50455,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,
@@ -50448,9 +50466,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
                         });
@@ -51427,7 +51474,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 {
@@ -51466,7 +51513,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(',')) {
@@ -52141,6 +52188,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;
             }
@@ -52161,6 +52213,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;
         }
@@ -55123,7 +55176,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);
                         }
                     });
@@ -60597,7 +60650,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.17.6-alpha.2";
+        version = "1.17.6";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -65438,6 +65491,8 @@
         _hasAggregationOnTopCount = 0;
         _hasAggregationOnBottomCount = 0;
         rowHierarchyType;
+        columnHierarchyType;
+        columnExpandLevel;
         _cellRangeMap;
         constructor(table, columns, showHeader, hierarchyIndent) {
             this._cellRangeMap = new Map();
@@ -65448,7 +65503,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;
@@ -66244,6 +66301,7 @@
                     headerType: hd.headerType ?? 'text',
                     dropDownMenu: hd.dropDownMenu,
                     define: hd,
+                    hierarchyState: hd.hierarchyState,
                     columnWidthComputeMode: hd.columnWidthComputeMode
                 };
                 results[id] = cell;
@@ -66256,7 +66314,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));
@@ -66812,7 +66871,7 @@
         return {};
     }
 
-    function listTableChangeCellValue(col, row, value, workOnEditableCell, table) {
+    function listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, table) {
         if ((workOnEditableCell && table.isHasEditorDefine(col, row)) || workOnEditableCell === false) {
             const recordIndex = table.getRecordShowIndexByCell(col, row);
             const { field } = table.internalProps.layoutMap.getBody(col, row);
@@ -66874,7 +66933,7 @@
                 table.scenegraph.updateRowHeight(row, newHeight - oldHeight);
             }
             const changedValue = table.getCellOriginValue(col, row);
-            if (oldValue !== changedValue) {
+            if (oldValue !== changedValue && triggerEvent) {
                 table.fireListeners(TABLE_EVENT_TYPE.CHANGE_CELL_VALUE, {
                     col,
                     row,
@@ -66886,7 +66945,7 @@
             table.scenegraph.updateNextFrame();
         }
     }
-    function listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, table) {
+    function listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, table) {
         let pasteColEnd = startCol;
         let pasteRowEnd = startRow;
         const beforeChangeValues = [];
@@ -66958,7 +67017,7 @@
                         table.dataSource.changeFieldValue(value, recordIndex, field, startCol + j, startRow + i, table);
                     }
                     const changedValue = table.getCellOriginValue(startCol + j, startRow + i);
-                    if (oldValue !== changedValue) {
+                    if (oldValue !== changedValue && triggerEvent) {
                         table.fireListeners(TABLE_EVENT_TYPE.CHANGE_CELL_VALUE, {
                             col: startCol + j,
                             row: startRow + i,
@@ -68134,6 +68193,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) {
@@ -68146,6 +68208,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, {
@@ -68490,11 +68574,11 @@
             }
             return isValid$3(editorDefine);
         }
-        changeCellValue(col, row, value, workOnEditableCell = false) {
-            return listTableChangeCellValue(col, row, value, workOnEditableCell, this);
+        changeCellValue(col, row, value, workOnEditableCell = false, triggerEvent = true) {
+            return listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, this);
         }
-        changeCellValues(startCol, startRow, values, workOnEditableCell = false) {
-            return listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, this);
+        changeCellValues(startCol, startRow, values, workOnEditableCell = false, triggerEvent = true) {
+            return listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, this);
         }
         addRecord(record, recordIndex) {
             listTableAddRecord(record, recordIndex, this);
@@ -83418,7 +83502,7 @@
     }
 
     registerForVrender();
-    const version = "1.17.6-alpha.2";
+    const version = "1.17.6";
     function getIcons() {
         return get$2();
     }