@visactor/vtable 1.11.3-alpha.0 → 1.11.3

package/dist/vtable.js

@@ -40389,7 +40389,8 @@
                 }
                 else {
                     const define = table.getBodyColumnDefine(col, row);
-                    cellDisable = define?.disableSelect;
+                    const disableSelect = define?.disableSelect;
+                    cellDisable = typeof disableSelect === 'function' ? disableSelect(col, row, table) : disableSelect;
                 }
                 if (cellDisable) {
                     selectMode = undefined;
@@ -40414,7 +40415,9 @@
     function isCellDisableSelect(table, col, row) {
         const columnDefine = table.getBodyColumnDefine(col, row);
         const isHeader = table.isHeader(col, row);
-        if (columnDefine?.disableSelect && !isHeader) {
+        const disableSelect = columnDefine?.disableSelect;
+        const cellDisable = typeof disableSelect === 'function' ? disableSelect(col, row, table) : disableSelect;
+        if (cellDisable && !isHeader) {
             return true;
         }
         if (isHeader && columnDefine?.disableHeaderSelect) {
@@ -45499,18 +45502,42 @@
         const columnResizeType = col === -1 ? 'all' : table.internalProps.columnResizeType;
         if (columnResizeType === 'column') {
             const columnGroup = scenegraph.getColGroup(col);
+            const columnHeaderGroup = scenegraph.getColGroup(col, true);
+            const columnBottomGroup = scenegraph.getColGroupInBottom(col, true);
             columnGroup?.forEachChildren((cellNode) => {
                 const width = table.getColWidth(cellNode.col);
                 const height = table.getRowHeight(cellNode.row);
                 updateChartGraphicSize(cellNode, width, height);
             });
+            columnHeaderGroup?.forEachChildren((cellNode) => {
+                const width = table.getColWidth(cellNode.col);
+                const height = table.getRowHeight(cellNode.row);
+                updateChartGraphicSize(cellNode, width, height);
+            });
+            columnBottomGroup?.forEachChildren((cellNode) => {
+                const width = table.getColWidth(cellNode.col);
+                const height = table.getRowHeight(cellNode.row);
+                updateChartGraphicSize(cellNode, width, height);
+            });
             if (table.widthMode === 'adaptive' && col < table.colCount - 1) {
                 const columnGroup = scenegraph.getColGroup(col + 1);
+                const columnHeaderGroup = scenegraph.getColGroup(col + 1, true);
+                const columnBottomGroup = scenegraph.getColGroupInBottom(col + 1, true);
                 columnGroup?.forEachChildren((cellNode) => {
                     const width = table.getColWidth(cellNode.col);
                     const height = table.getRowHeight(cellNode.row);
                     updateChartGraphicSize(cellNode, width, height);
                 });
+                columnHeaderGroup?.forEachChildren((cellNode) => {
+                    const width = table.getColWidth(cellNode.col);
+                    const height = table.getRowHeight(cellNode.row);
+                    updateChartGraphicSize(cellNode, width, height);
+                });
+                columnBottomGroup?.forEachChildren((cellNode) => {
+                    const width = table.getColWidth(cellNode.col);
+                    const height = table.getRowHeight(cellNode.row);
+                    updateChartGraphicSize(cellNode, width, height);
+                });
             }
         }
         else {
@@ -45539,6 +45566,8 @@
             }
             for (let c = startCol; c <= endCol; c++) {
                 const columnGroup = scenegraph.getColGroup(c);
+                const columnHeaderGroup = scenegraph.getColGroup(c, true);
+                const columnBottomGroup = scenegraph.getColGroupInBottom(c, true);
                 if (columnGroup) {
                     if (columnResizeType === 'indicator') {
                         const indicatorKey = layout.getIndicatorKey(c, table.columnHeaderLevelCount);
@@ -45560,6 +45589,16 @@
                         const height = table.getRowHeight(cellNode.row);
                         updateChartGraphicSize(cellNode, width, height);
                     });
+                    columnHeaderGroup?.forEachChildren((cellNode) => {
+                        const width = table.getColWidth(cellNode.col);
+                        const height = table.getRowHeight(cellNode.row);
+                        updateChartGraphicSize(cellNode, width, height);
+                    });
+                    columnBottomGroup?.forEachChildren((cellNode) => {
+                        const width = table.getColWidth(cellNode.col);
+                        const height = table.getRowHeight(cellNode.row);
+                        updateChartGraphicSize(cellNode, width, height);
+                    });
                 }
             }
         }
@@ -45592,49 +45631,58 @@
             startRow = node.startInTotal + table.frozenRowCount;
             endRow = node.startInTotal + table.frozenRowCount + node.size - 1;
         }
-        for (let col = scenegraph.proxy.colStart; col <= scenegraph.proxy.colEnd; col++) {
-            if (rowResizeType === 'row') {
-                const cellNode = scenegraph.highPerformanceGetCell(col, row);
-                if (cellNode.role !== 'cell') {
-                    continue;
-                }
-                const width = table.getColWidth(cellNode.col);
-                const height = table.getRowHeight(cellNode.row);
-                updateChartGraphicSize(cellNode, width, height);
-                if (table.heightMode === 'adaptive' && row < table.rowCount - 1) {
-                    const cellNode = scenegraph.highPerformanceGetCell(col, row + 1);
+        const colsRange = [{ startCol: scenegraph.proxy.colStart, endCol: scenegraph.proxy.colEnd }];
+        if (table.frozenColCount) {
+            colsRange.push({ startCol: 0, endCol: table.frozenColCount - 1 });
+        }
+        if (table.rightFrozenColCount) {
+            colsRange.push({ startCol: table.colCount - table.rightFrozenColCount, endCol: table.colCount - 1 });
+        }
+        colsRange.forEach(({ startCol, endCol }) => {
+            for (let col = startCol; col <= endCol; col++) {
+                if (rowResizeType === 'row') {
+                    const cellNode = scenegraph.highPerformanceGetCell(col, row);
+                    if (cellNode.role !== 'cell') {
+                        continue;
+                    }
                     const width = table.getColWidth(cellNode.col);
                     const height = table.getRowHeight(cellNode.row);
                     updateChartGraphicSize(cellNode, width, height);
+                    if (table.heightMode === 'adaptive' && row < table.rowCount - 1) {
+                        const cellNode = scenegraph.highPerformanceGetCell(col, row + 1);
+                        const width = table.getColWidth(cellNode.col);
+                        const height = table.getRowHeight(cellNode.row);
+                        updateChartGraphicSize(cellNode, width, height);
+                    }
                 }
-            }
-            else {
-                for (let r = startRow; r <= endRow; r++) {
-                    if (rowResizeType === 'indicator') {
-                        const indicatorKey = layout.getIndicatorKey(state.table.rowHeaderLevelCount, r);
-                        if (!layout.indicatorsAsCol && indicatorKey !== resizeIndicatorKey) {
-                            continue;
-                        }
-                        else if (layout.indicatorsAsCol) {
-                            const headerPaths = layout.getCellHeaderPaths(state.table.rowHeaderLevelCount - 1, r);
-                            const headerPath = headerPaths?.rowHeaderPaths[headerPaths.rowHeaderPaths.length - 1];
-                            if (!headerPath ||
-                                resizeDimensionKey !== headerPath.dimensionKey ||
-                                resizeDimensionValue !== headerPath.value) {
+                else {
+                    for (let r = startRow; r <= endRow; r++) {
+                        if (rowResizeType === 'indicator') {
+                            const indicatorKey = layout.getIndicatorKey(state.table.rowHeaderLevelCount, r);
+                            if (!layout.indicatorsAsCol && indicatorKey !== resizeIndicatorKey) {
                                 continue;
                             }
+                            else if (layout.indicatorsAsCol) {
+                                const headerPaths = layout.getCellHeaderPaths(state.table.rowHeaderLevelCount - 1, r);
+                                const headerPath = headerPaths?.rowHeaderPaths[headerPaths.rowHeaderPaths.length - 1];
+                                if (!headerPath ||
+                                    resizeDimensionKey !== headerPath.dimensionKey ||
+                                    resizeDimensionValue !== headerPath.value) {
+                                    continue;
+                                }
+                            }
                         }
+                        const cellNode = scenegraph.highPerformanceGetCell(col, r);
+                        if (cellNode.role !== 'cell') {
+                            continue;
+                        }
+                        const width = table.getColWidth(cellNode.col);
+                        const height = table.getRowHeight(cellNode.row);
+                        updateChartGraphicSize(cellNode, width, height);
                     }
-                    const cellNode = scenegraph.highPerformanceGetCell(col, r);
-                    if (cellNode.role !== 'cell') {
-                        continue;
-                    }
-                    const width = table.getColWidth(cellNode.col);
-                    const height = table.getRowHeight(cellNode.row);
-                    updateChartGraphicSize(cellNode, width, height);
                 }
             }
-        }
+        });
     }
     function clearChartCacheImage(scenegraph) {
         for (let c = scenegraph.proxy.colStart; c <= scenegraph.proxy.colEnd; c++) {
@@ -46817,7 +46865,13 @@
             }
             return element || undefined;
         }
-        getColGroupInBottom(col) {
+        getColGroupInBottom(col, isCornerOrColHeader = false) {
+            if (isCornerOrColHeader) {
+                const element = this.getColGroupInLeftBottomCorner(col) ?? this.getColGroupInRightBottomCorner(col);
+                if (element) {
+                    return element;
+                }
+            }
             if (this.table.bottomFrozenRowCount > 0) {
                 return this.bottomFrozenGroup.getColGroup(col);
             }
@@ -48200,7 +48254,10 @@
         const { table, interactionState } = state;
         const { scenegraph } = table;
         const { highlightScope, disableHeader, cellPos } = state.select;
-        if (((disableHeader && table.isHeader(col, row)) || highlightScope === 'none') && forceSelect === false) {
+        const disableSelect = table.options?.select?.disableSelect;
+        const cellDisable = typeof disableSelect === 'function' ? disableSelect(col, row, table) : disableSelect;
+        if (((disableHeader && table.isHeader(col, row)) || highlightScope === 'none' || cellDisable) &&
+            forceSelect === false) {
             if (col !== -1 && row !== -1 && makeSelectCellVisible) {
                 table._makeVisibleCell(col, row);
             }
@@ -49441,7 +49498,7 @@
             isNeedInitHeaderCheckedStateFromRecord = true;
         }
         if (isNeedInitHeaderCheckedStateFromRecord) {
-            records.forEach((record, index) => {
+            records?.forEach((record, index) => {
                 state._checkboxCellTypeFields.forEach(field => {
                     const value = record[field];
                     let isChecked;
@@ -49983,7 +50040,10 @@
                 highlightMode: 'cell',
                 highlightInRange: false
             }, this.table.options.select);
-            if (!disableSelect) {
+            if (disableSelect === true) {
+                this.select.highlightScope = HighlightScope.none;
+            }
+            else {
                 if (highlightMode === 'cross') {
                     this.select.highlightScope = HighlightScope.cross;
                 }
@@ -49997,9 +50057,6 @@
                     this.select.highlightScope = HighlightScope.single;
                 }
             }
-            else {
-                this.select.highlightScope = HighlightScope.none;
-            }
             this.select.singleStyle = !disableSelect;
             this.select.disableHeader = disableHeaderSelect;
             this.select.headerSelectMode = headerSelectMode;
@@ -53175,6 +53232,8 @@
                     return false;
                 }
                 const define = this.table.getBodyColumnDefine(eventArgs.col, eventArgs.row);
+                const disableSelect = define?.disableSelect;
+                const cellDisable = typeof disableSelect === 'function' ? disableSelect(eventArgs.col, eventArgs.row, this.table) : disableSelect;
                 if (this.table.isHeader(eventArgs.col, eventArgs.row) &&
                     (define?.disableHeaderSelect || this.table.stateManager.select?.disableHeader)) {
                     if (!isSelectMoving) {
@@ -53182,7 +53241,7 @@
                     }
                     return false;
                 }
-                else if (!this.table.isHeader(eventArgs.col, eventArgs.row) && define?.disableSelect) {
+                else if (!this.table.isHeader(eventArgs.col, eventArgs.row) && cellDisable) {
                     if (!isSelectMoving) {
                         const isHasSelected = !!this.table.stateManager.select.ranges?.length;
                         this.table.stateManager.updateSelectPos(-1, -1);
@@ -53197,7 +53256,7 @@
                     this.table.stateManager.updateSelectPos(-1, -1);
                     return false;
                 }
-                this.table.stateManager.updateSelectPos(eventArgs.col, eventArgs.row, eventArgs.event.shiftKey, eventArgs.event.ctrlKey || eventArgs.event.metaKey, false, this.table.options.select?.makeSelectCellVisible ?? true);
+                this.table.stateManager.updateSelectPos(eventArgs.col, eventArgs.row, eventArgs.event.shiftKey, eventArgs.event.ctrlKey || eventArgs.event.metaKey, false, isSelectMoving ? false : this.table.options.select?.makeSelectCellVisible ?? true);
                 return true;
             }
             return false;
@@ -55492,8 +55551,8 @@
                 const cellPos = cellStyle.cellPosition;
                 if (cellStyle.customStyleId === customStyleId) {
                     if (cellPos.range) {
-                        for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) {
-                            for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) {
+                        for (let col = Math.max(0, cellPos.range.start.col); col <= Math.min(this.table.colCount - 1, cellPos.range.end.col); col++) {
+                            for (let row = Math.max(0, cellPos.range.start.row); row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row); row++) {
                                 this.table.scenegraph.updateCellContent(col, row);
                             }
                         }
@@ -55538,8 +55597,8 @@
                 this.customCellStyleArrangement.splice(index, 1);
             }
             if (cellPos.range) {
-                for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) {
-                    for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) {
+                for (let col = Math.max(0, cellPos.range.start.col); col <= Math.min(this.table.colCount - 1, cellPos.range.end.col); col++) {
+                    for (let row = Math.max(0, cellPos.range.start.row); row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row); row++) {
                         const range = this.table.getCellRange(col, row);
                         for (let c = range.start.col; c <= range.end.col; c++) {
                             for (let r = range.start.row; r <= range.end.row; r++) {
@@ -57585,7 +57644,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.11.3-alpha.0";
+        version = "1.11.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -59487,6 +59546,8 @@
             return true;
         }
         _canDragHeaderPosition(col, row) {
+            const disableSelect = this.options.select?.disableSelect;
+            const cellDisable = typeof disableSelect === 'function' ? disableSelect(col, row, this) : disableSelect;
             if (this.isHeader(col, row) &&
                 (this.stateManager.isSelected(col, row) ||
                     (this.options.select?.headerSelectMode === 'body' &&
@@ -59494,7 +59555,7 @@
                             this.getCellRange(this.stateManager.select.cellPos.col, this.stateManager.select.cellPos.row)
                         ])) ||
                     this.options.select?.disableHeaderSelect ||
-                    this.options.select?.disableSelect)) {
+                    cellDisable)) {
                 if (this.internalProps.frozenColDragHeaderMode === 'disabled' && this.isFrozenColumn(col)) {
                     return false;
                 }
@@ -63529,12 +63590,12 @@
             }
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
             if (options.enableTreeStickCell) {
@@ -63807,12 +63868,12 @@
             }
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
             return new Promise(resolve => {
@@ -64276,12 +64337,12 @@
             }
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
             this.render();
@@ -64359,15 +64420,15 @@
         }
         addRecord(record, recordIndex) {
             listTableAddRecord(record, recordIndex, this);
-            this.internalProps.emptyTip.resetVisible();
+            this.internalProps.emptyTip?.resetVisible();
         }
         addRecords(records, recordIndex) {
             listTableAddRecords(records, recordIndex, this);
-            this.internalProps.emptyTip.resetVisible();
+            this.internalProps.emptyTip?.resetVisible();
         }
         deleteRecords(recordIndexs) {
             listTableDeleteRecords(recordIndexs, this);
-            this.internalProps.emptyTip.resetVisible();
+            this.internalProps.emptyTip?.resetVisible();
         }
         updateRecords(records, recordIndexs) {
             listTableUpdateRecords(records, recordIndexs, this);
@@ -74007,12 +74068,12 @@
                 }
                 if (this.options.emptyTip) {
                     if (this.internalProps.emptyTip) {
-                        this.internalProps.emptyTip.resetVisible();
+                        this.internalProps.emptyTip?.resetVisible();
                     }
                     else {
                         const EmptyTip = Factory.getComponent('emptyTip');
                         this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                        this.internalProps.emptyTip.resetVisible();
+                        this.internalProps.emptyTip?.resetVisible();
                     }
                 }
                 setTimeout(() => {
@@ -74150,12 +74211,12 @@
             }
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
             return new Promise(resolve => {
@@ -74694,9 +74755,14 @@
                 const dimensions = item.dimensions;
                 const width = item.width;
                 const cell = this.getCellAddressByHeaderPaths(dimensions);
-                if (cell && !this.internalProps._widthResizedColMap.has(cell.col)) {
-                    this._setColWidth(cell.col, width);
-                    this.internalProps._widthResizedColMap.add(cell.col);
+                if (cell.col >= this.rowHeaderLevelCount) {
+                    const cellPath = this.getCellHeaderPaths(cell.col, this.columnHeaderLevelCount - 1);
+                    if (cellPath.colHeaderPaths.length === dimensions.length) {
+                        if (cell && !this.internalProps._widthResizedColMap.has(cell.col)) {
+                            this._setColWidth(cell.col, width);
+                            this.internalProps._widthResizedColMap.add(cell.col);
+                        }
+                    }
                 }
             }
         }
@@ -75008,12 +75074,12 @@
             this.eventManager.updateEventBinder();
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
         }
@@ -75526,12 +75592,12 @@
             }
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
             setTimeout(() => {
@@ -75691,12 +75757,12 @@
             }
             if (this.options.emptyTip) {
                 if (this.internalProps.emptyTip) {
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
                 else {
                     const EmptyTip = Factory.getComponent('emptyTip');
                     this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
-                    this.internalProps.emptyTip.resetVisible();
+                    this.internalProps.emptyTip?.resetVisible();
                 }
             }
             return new Promise(resolve => {
@@ -77267,7 +77333,7 @@
     }
 
     registerForVrender();
-    const version = "1.11.3-alpha.0";
+    const version = "1.11.3";
     function getIcons() {
         return get$2();
     }