@visactor/vtable 0.24.1 → 0.24.2-alpha.2

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        if (super(), this.showFrozenIcon = !0, this.version = "0.24.1", this.id = `VTable${Date.now()}`, 
+        if (super(), this.showFrozenIcon = !0, this.version = "0.24.2-alpha.2", this.id = `VTable${Date.now()}`, 
         this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
         const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, widthAdaptiveMode: widthAdaptiveMode = "only-body", heightAdaptiveMode: heightAdaptiveMode = "only-body", keyboardOptions: keyboardOptions, eventOptions: eventOptions, rowSeriesNumber: rowSeriesNumber, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
@@ -1563,7 +1563,31 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     cellIsInVisualView(col, row) {
         const drawRange = this.getDrawRange(), rect = this.getCellRelativeRect(col, row);
-        return col < this.frozenColCount && row < this.frozenRowCount || rect.top >= drawRange.top && rect.bottom <= drawRange.bottom && rect.left >= drawRange.left && rect.right <= drawRange.right;
+        if (col < this.frozenColCount && row < this.frozenRowCount) return !0;
+        const colHeaderRangeRect = this.getCellRangeRelativeRect({
+            start: {
+                col: 0,
+                row: 0
+            },
+            end: {
+                col: this.colCount - 1,
+                row: this.columnHeaderLevelCount
+            }
+        }), rowHeaderRangeRect = this.getCellRangeRelativeRect({
+            start: {
+                col: 0,
+                row: 0
+            },
+            end: {
+                col: this.rowHeaderLevelCount,
+                row: this.rowCount - 1
+            }
+        });
+        if (rect.top >= drawRange.top && rect.bottom <= drawRange.bottom && rect.left >= drawRange.left && rect.right <= drawRange.right) {
+            if (this.isHeader(col, row)) return !0;
+            if (drawRange.top >= colHeaderRangeRect.bottom && drawRange.left >= rowHeaderRangeRect.right) return !0;
+        }
+        return !1;
     }
     getCustomMergeValue(col, row) {
         if (this.internalProps.customMergeCell) {
@@ -1588,7 +1612,8 @@ class BaseTable extends EventTarget_1.EventTarget {
         (null === (_b = null === (_a = this.stateManager.select) || void 0 === _a ? void 0 : _a.ranges) || void 0 === _b ? void 0 : _b.length) > 0 && (0, 
         update_select_border_1.hideCellSelectBorder)(this.scenegraph);
         const {col: hoverCol, row: hoverRow} = this.stateManager.hover.cellPos;
-        this.stateManager.updateHoverPos(-1, -1), this.scenegraph.renderSceneGraph();
+        this.stateManager.updateHoverPos(-1, -1), this.scenegraph.component.hideVerticalScrollBar(), 
+        this.scenegraph.component.hideHorizontalScrollBar(), this.scenegraph.renderSceneGraph();
         const c = this.scenegraph.stage.toCanvas(!1, (new vutils_1.AABBBounds).set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
         return isInView || (this.setScrollTop(scrollTop), this.setScrollLeft(scrollLeft)), 
         (null === (_d = null === (_c = this.stateManager.select) || void 0 === _c ? void 0 : _c.ranges) || void 0 === _d ? void 0 : _d.length) > 0 && (0, 
@@ -1596,6 +1621,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         c.toDataURL();
     }
     exportCellRangeImg(cellRange) {
+        var _a, _b, _c, _d;
         const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, minCol = Math.min(cellRange.start.col, cellRange.end.col), minRow = Math.min(cellRange.start.row, cellRange.end.row), maxCol = Math.max(cellRange.start.col, cellRange.end.col), maxRow = Math.max(cellRange.start.row, cellRange.end.row), isInView = this.cellIsInVisualView(minCol, minRow), isMaxCellInView = this.cellIsInVisualView(maxCol, maxRow);
         isInView && isMaxCellInView || this.scrollToCell({
             col: minCol,
@@ -1610,8 +1636,16 @@ class BaseTable extends EventTarget_1.EventTarget {
                 col: maxCol,
                 row: maxRow
             }
-        }), base64Image = this.scenegraph.stage.toCanvas(!1, (new vutils_1.AABBBounds).set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY)).toDataURL();
+        });
+        (null === (_b = null === (_a = this.stateManager.select) || void 0 === _a ? void 0 : _a.ranges) || void 0 === _b ? void 0 : _b.length) > 0 && (0, 
+        update_select_border_1.hideCellSelectBorder)(this.scenegraph);
+        const {col: hoverCol, row: hoverRow} = this.stateManager.hover.cellPos;
+        this.stateManager.updateHoverPos(-1, -1), this.scenegraph.component.hideVerticalScrollBar(), 
+        this.scenegraph.component.hideHorizontalScrollBar(), this.scenegraph.renderSceneGraph();
+        const base64Image = this.scenegraph.stage.toCanvas(!1, (new vutils_1.AABBBounds).set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY)).toDataURL();
         return isInView && isMaxCellInView || (this.setScrollTop(scrollTop), this.setScrollLeft(scrollLeft)), 
+        (null === (_d = null === (_c = this.stateManager.select) || void 0 === _c ? void 0 : _c.ranges) || void 0 === _d ? void 0 : _d.length) > 0 && (0, 
+        update_select_border_1.restoreCellSelectBorder)(this.scenegraph), this.stateManager.updateHoverPos(hoverCol, hoverRow), 
         base64Image;
     }
     exportCanvas() {