k-vtable 1.0.36 → 1.0.38

package/es/state/state.js

@@ -30,6 +30,8 @@ import { endMoveCol, startMoveCol, updateMoveCol } from "./cell-move";
 
 import { getIconAndPositionFromTarget } from "../scenegraph/utils/icon";
 
+import { getBodyHorizontalScrollRange } from "../scenegraph/component/util";
+
 import { debounce } from "../tools/debounce";
 
 import { updateResizeColumn } from "./resize/update-resize-column";
@@ -537,8 +539,8 @@ export class StateManager {
         }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
     }
     updateHorizontalScrollBar(xRatio) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const totalWidth = this.table.getAllColsWidth(), oldHorizontalBarPos = this.scroll.horizontalBarPos, frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0, rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0, scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset);
+        var _a, _b, _c, _d;
+        const oldHorizontalBarPos = this.scroll.horizontalBarPos, scrollRange = getBodyHorizontalScrollRange(this.table);
         let horizontalBarPos = Math.ceil(xRatio * scrollRange);
         isValid(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
         const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
@@ -546,8 +548,8 @@ export class StateManager {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
-            scrollHeight: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
-            scrollWidth: null === (_h = this.table.theme.scrollStyle) || void 0 === _h ? void 0 : _h.width,
+            scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
+            scrollWidth: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -562,8 +564,8 @@ export class StateManager {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
-            scrollHeight: null === (_j = this.table.theme.scrollStyle) || void 0 === _j ? void 0 : _j.width,
-            scrollWidth: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
+            scrollHeight: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
+            scrollWidth: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -616,13 +618,13 @@ export class StateManager {
         }), oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
     }
     setScrollLeft(left, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!this.table || !this.table.scenegraph) return;
         this.table.scrollLeft;
-        const totalWidth = this.table.getAllColsWidth(), frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0, rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0, scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset), sizeTolerance = (null === (_g = this.table.options.customConfig) || void 0 === _g ? void 0 : _g._disableColumnAndRowSizeRound) ? 1 : 0;
+        const scrollRange = getBodyHorizontalScrollRange(this.table), sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
         left = Math.max(0, Math.min(left, scrollRange - sizeTolerance)), left = Math.ceil(left);
         const oldHorizontalBarPos = this.scroll.horizontalBarPos, xRatio = scrollRange ? left / scrollRange : 0;
-        if ((oldHorizontalBarPos !== left || !0 === (null === (_j = null === (_h = this.table.options) || void 0 === _h ? void 0 : _h.customConfig) || void 0 === _j ? void 0 : _j.scrollEventAlwaysTrigger)) && triggerEvent) {
+        if ((oldHorizontalBarPos !== left || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
             let horizontalBarPos = left;
             isValid(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
             const dx = horizontalBarPos - oldHorizontalBarPos;
@@ -630,8 +632,8 @@ export class StateManager {
                 event: null == event ? void 0 : event.nativeEvent,
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: horizontalBarPos,
-                scrollHeight: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
-                scrollWidth: null === (_l = this.table.theme.scrollStyle) || void 0 === _l ? void 0 : _l.width,
+                scrollHeight: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
+                scrollWidth: null === (_e = this.table.theme.scrollStyle) || void 0 === _e ? void 0 : _e.width,
                 viewHeight: this.table.tableNoFrameHeight,
                 viewWidth: this.table.tableNoFrameWidth,
                 scrollDirection: "horizontal",
@@ -650,8 +652,8 @@ export class StateManager {
             event: null == event ? void 0 : event.nativeEvent,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
-            scrollHeight: null === (_m = this.table.theme.scrollStyle) || void 0 === _m ? void 0 : _m.width,
-            scrollWidth: null === (_o = this.table.theme.scrollStyle) || void 0 === _o ? void 0 : _o.width,
+            scrollHeight: null === (_f = this.table.theme.scrollStyle) || void 0 === _f ? void 0 : _f.width,
+            scrollWidth: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",