@visactor/vtable 1.23.3 → 1.24.0

package/cjs/core/BaseTable.d.ts

@@ -27,6 +27,7 @@ import { PluginManager } from '../plugins/plugin-manager';
 export declare abstract class BaseTable extends EventTarget implements BaseTableAPI {
     internalProps: IBaseTableProtected;
     showFrozenIcon: boolean;
+    _scrollToRowCorrectTimer: ReturnType<typeof setTimeout> | null;
     padding: {
         top: number;
         left: number;
@@ -264,6 +265,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
         release: () => void;
     }): void;
     private dispose;
+    clearCorrectTimer(): void;
     release(): void;
     fireListeners<TYPE extends keyof TableEventHandlersEventArgumentMap>(type: TYPE, event: TableEventHandlersEventArgumentMap[TYPE]): TableEventHandlersReturnMap[TYPE][];
     updateOption(options: BaseTableConstructorOptions, updateConfig?: {
@@ -296,6 +298,11 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     endDragSelect(): void;
     startDragSelectRow(rowIndex: number, enableCtrlSelectMode?: boolean, isShift?: boolean, makeSelectCellVisible?: boolean): void;
     dragSelectRow(rowIndex: number, isCtrl?: boolean, makeSelectCellVisible?: boolean): void;
+    changeHeaderPosition(args: {
+        source: CellAddress;
+        target: CellAddress;
+        movingColumnOrRow?: 'column' | 'row';
+    }): boolean;
     abstract isListTable(): boolean;
     abstract isPivotTable(): boolean;
     abstract isPivotChart(): boolean;
@@ -457,6 +464,8 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     disableScroll(): void;
     enableScroll(): void;
     getGroupTitleLevel(col: number, row: number): number | undefined;
+    getTargetScrollTop(row: number): number;
+    private _scheduleScrollToRowCorrect;
     scrollToRow(row: number, animationOption?: ITableAnimationOption | boolean): void;
     scrollToCol(col: number, animationOption?: ITableAnimationOption | boolean): void;
     scrollToCell(cellAddr: {

package/cjs/core/BaseTable.js

@@ -43,12 +43,12 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, 
-        this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.23.3", 
-        this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, 
-        this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), "node" === env_1.Env.mode ? (options = container, 
-        container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), 
-        !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, 
+        this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, 
+        this.version = "1.24.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
+        this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
+        "node" === env_1.Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
+        container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new plugin_manager_1.PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.BEFORE_INIT, {
             options: options,
             container: container
@@ -946,6 +946,9 @@ class BaseTable extends EventTarget_1.EventTarget {
     dispose() {
         this.release();
     }
+    clearCorrectTimer() {
+        this._scrollToRowCorrectTimer && (clearTimeout(this._scrollToRowCorrectTimer), this._scrollToRowCorrectTimer = null);
+    }
     release() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
         null === (_c = null === (_b = null === (_a = this.scenegraph) || void 0 === _a ? void 0 : _a.component) || void 0 === _b ? void 0 : _b.vScrollBar) || void 0 === _c || _c.release(), 
@@ -953,7 +956,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         this.animationManager.clear(), this.animationManager.ticker.release(), null === (_j = null === (_h = null === (_g = this.scenegraph) || void 0 === _g ? void 0 : _g.stage) || void 0 === _h ? void 0 : _h.ticker) || void 0 === _j || _j.release();
         const internalProps = this.internalProps;
         if (this.isReleased) return;
-        null === (_l = null === (_k = internalProps.tooltipHandler) || void 0 === _k ? void 0 : _k.release) || void 0 === _l || _l.call(_k), 
+        this.clearCorrectTimer(), null === (_l = null === (_k = internalProps.tooltipHandler) || void 0 === _k ? void 0 : _k.release) || void 0 === _l || _l.call(_k), 
         null === (_o = null === (_m = internalProps.menuHandler) || void 0 === _m ? void 0 : _m.release) || void 0 === _o || _o.call(_m), 
         null === (_p = super.release) || void 0 === _p || _p.call(this), this.pluginManager.release(), 
         null === (_r = null === (_q = internalProps.handler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), 
@@ -1267,6 +1270,31 @@ class BaseTable extends EventTarget_1.EventTarget {
         lastSelectRange && (lastSelectRange.end.row = rowIndex), this.stateManager.updateSelectPos(this.colCount - 1, rowIndex, !1, isCtrl, !1, makeSelectCellVisible, !0), 
         this.stateManager.select.selecting = !1;
     }
+    changeHeaderPosition(args) {
+        var _a, _b, _c, _d, _e;
+        if (!("canMoveHeaderPosition" in this.internalProps.layoutMap) || !0 === (null === (_a = this.options.customConfig) || void 0 === _a ? void 0 : _a.notUpdateInColumnRowMove)) return !1;
+        const prevMoving = this.stateManager.columnMove.movingColumnOrRow;
+        this.stateManager.columnMove.movingColumnOrRow = args.movingColumnOrRow;
+        try {
+            if (!1 === (null === (_c = (_b = this.internalProps.layoutMap).canMoveHeaderPosition) || void 0 === _c ? void 0 : _c.call(_b, args.source, args.target))) return !1;
+            const oldSourceMergeInfo = this.getCellRange(args.source.col, args.source.row), oldTargetMergeInfo = this.getCellRange(args.target.col, args.target.row), moveContext = this._moveHeaderPosition(args.source, args.target);
+            if (!moveContext || moveContext.targetIndex === moveContext.sourceIndex) return !1;
+            this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.layoutMap.clearCellRangeMap();
+            const sourceMergeInfo = this.getCellRange(args.source.col, args.source.row), targetMergeInfo = this.getCellRange(args.target.col, args.target.row), colMin = Math.min(sourceMergeInfo.start.col, targetMergeInfo.start.col, oldSourceMergeInfo.start.col, oldTargetMergeInfo.start.col), colMax = Math.max(sourceMergeInfo.end.col, targetMergeInfo.end.col, oldSourceMergeInfo.end.col, oldTargetMergeInfo.end.col), rowMin = Math.min(sourceMergeInfo.start.row, targetMergeInfo.start.row, oldSourceMergeInfo.start.row, oldTargetMergeInfo.start.row);
+            let rowMax = Math.max(sourceMergeInfo.end.row, targetMergeInfo.end.row, oldSourceMergeInfo.end.row, oldTargetMergeInfo.end.row);
+            if ("row" === moveContext.moveType && "tree" === this.internalProps.layoutMap.rowHierarchyType && (rowMax = moveContext.targetIndex > moveContext.sourceIndex ? rowMax + moveContext.targetSize - 1 : rowMax + moveContext.sourceSize - 1), 
+            this.transpose || !this.isSeriesNumberInBody(args.source.col, args.source.row) && "row" !== args.movingColumnOrRow || (this.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex), 
+            this.stateManager.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex)), 
+            "column" === moveContext.moveType) for (let col = colMin; col <= colMax; col++) this._clearColRangeWidthsMap(col); else for (let row = rowMin; row <= rowMax; row++) this._clearRowRangeHeightsMap(row);
+            return this.clearCellStyleCache(), this.isSeriesNumberInBody(args.source.col, args.source.row) || "row" === args.movingColumnOrRow ? this.scenegraph.updateHeaderPosition(this.scenegraph.proxy.colStart, this.scenegraph.proxy.colEnd, this.scenegraph.proxy.rowStart, this.scenegraph.proxy.rowEnd, moveContext.moveType) : "column" === moveContext.moveType ? this.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType) : this.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType), 
+            "adjustFrozenCount" === this.internalProps.frozenColDragHeaderMode && this.isListTable() && (this.isLeftFrozenColumn(args.target.col) && !this.isLeftFrozenColumn(args.source.col) ? this.frozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isLeftFrozenColumn(args.source.col) && !this.isLeftFrozenColumn(args.target.col) && (this.frozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1), 
+            this.isRightFrozenColumn(args.target.col) && !this.isRightFrozenColumn(args.source.col) ? this.rightFrozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isRightFrozenColumn(args.source.col) && !this.isRightFrozenColumn(args.target.col) && (this.rightFrozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1)), 
+            null === (_e = (_d = this.scenegraph).updateNextFrame) || void 0 === _e || _e.call(_d), 
+            !0;
+        } finally {
+            this.stateManager.columnMove.movingColumnOrRow = prevMoving;
+        }
+    }
     get recordsCount() {
         var _a;
         return null === (_a = this.records) || void 0 === _a ? void 0 : _a.length;
@@ -1419,7 +1447,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     getCustomMerge(col, row) {
         if (this.internalProps.customMergeCell) {
             const customMerge = this.internalProps.customMergeCell(col, row, this);
-            if (customMerge && customMerge.range && ((0, vutils_1.isValid)(customMerge.text) || customMerge.customLayout || this.customRender)) {
+            if (customMerge && customMerge.range) {
                 if (customMerge.style) {
                     const styleClass = this.internalProps.bodyHelper.getStyleClass("text"), style = customMerge.style, fullStyle = columnStyleContents.of(style, this.theme.bodyStyle, {
                         col: col,
@@ -2075,12 +2103,33 @@ class BaseTable extends EventTarget_1.EventTarget {
         this.eventManager.enableScroll();
     }
     getGroupTitleLevel(col, row) {}
+    getTargetScrollTop(row) {
+        const drawRange = this.getDrawRange(), frozenHeight = this.getFrozenRowsHeight();
+        return Math.max(0, Math.min(this.getRowsHeight(0, row - 1) - frozenHeight, this.getAllRowsHeight() - drawRange.height));
+    }
+    _scheduleScrollToRowCorrect(row, delay = 0) {
+        this._scrollToRowCorrectTimer = setTimeout((() => {
+            this.clearCorrectTimer();
+            const targetScrollTop = this.getTargetScrollTop(row);
+            if (targetScrollTop !== this.scrollTop) {
+                this.scrollTop = targetScrollTop;
+                const correctedTargetScrollTop = this.getTargetScrollTop(row);
+                correctedTargetScrollTop !== this.scrollTop && (this.scrollTop = correctedTargetScrollTop);
+            }
+        }), delay);
+    }
     scrollToRow(row, animationOption) {
-        animationOption ? this.animationManager.scrollTo({
-            row: row
-        }, animationOption) : this.scrollToCell({
-            row: row
-        });
+        var _a;
+        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        if (this.clearCorrectTimer(), !animationOption) return this.scrollToCell({
+            row: targetRow
+        }), void this._scheduleScrollToRowCorrect(targetRow);
+        const duration = (0, vutils_1.isBoolean)(animationOption) ? 3e3 : null !== (_a = null == animationOption ? void 0 : animationOption.duration) && void 0 !== _a ? _a : 3e3;
+        this.animationManager.scrollTo({
+            row: targetRow
+        }, animationOption), this._scrollToRowCorrectTimer = setTimeout((() => {
+            this.scrollToRow(targetRow, !1);
+        }), duration);
     }
     scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({
@@ -2097,8 +2146,8 @@ class BaseTable extends EventTarget_1.EventTarget {
             this.scrollLeft = Math.min(left - frozenWidth, this.getAllColsWidth() - drawRange.width);
         }
         if ((0, vutils_1.isValid)(cellAddr.row) && cellAddr.row >= this.frozenRowCount) {
-            const frozenHeight = this.getFrozenRowsHeight(), top = this.getRowsHeight(0, cellAddr.row - 1);
-            this.scrollTop = Math.min(top - frozenHeight, this.getAllRowsHeight() - drawRange.height);
+            const frozenHeight = this.getFrozenRowsHeight(), top = this.rowHeightsMap.getSumInRange(0, cellAddr.row - 1);
+            this.scrollTop = Math.min(top - frozenHeight, this.rowHeightsMap.getSumInRange(0, this.rowCount - 1) - drawRange.height);
         }
         this.render();
     }