k-vtable 1.0.34 → 1.0.35

package/cjs/state/state.js

@@ -13,7 +13,8 @@ class StateManager {
         this.resetInteractionState = (0, debounce_1.debounce)((state => {
             this.updateInteractionState(null != state ? state : ts_types_1.InteractionState.default);
         }), 100), this.table = table, this.initState(), this.updateVerticalScrollBar = this.updateVerticalScrollBar.bind(this), 
-        this.updateHorizontalScrollBar = this.updateHorizontalScrollBar.bind(this);
+        this.updateHorizontalScrollBar = this.updateHorizontalScrollBar.bind(this), this.updateFrozenHorizontalScrollBar = this.updateFrozenHorizontalScrollBar.bind(this), 
+        this.updateRightFrozenHorizontalScrollBar = this.updateRightFrozenHorizontalScrollBar.bind(this);
     }
     initState() {
         this._initState(), this.setHoverState(), this.setSelectState(), this.setFrozenState();
@@ -21,8 +22,14 @@ class StateManager {
     updateOptionSetState() {
         this._updateOptionSetState(), this.setHoverState(), this.setSelectState(), this.setFrozenState();
     }
+    endResizeIfResizing() {
+        this.columnResize.resizing && (this.table.scenegraph.component.hideResizeCol(), 
+        this.columnResize.resizing = !1), this.rowResize.resizing && (this.table.scenegraph.component.hideResizeRow(), 
+        this.rowResize.resizing = !1), this.interactionState === ts_types_1.InteractionState.grabing && (this.interactionState = ts_types_1.InteractionState.default);
+    }
     _updateOptionSetState() {
-        this.interactionState = ts_types_1.InteractionState.default, this.hoverIcon = {
+        this.endResizeIfResizing(), this.interactionState = ts_types_1.InteractionState.default, 
+        this.hoverIcon = {
             col: -1,
             row: -1,
             icon: null
@@ -131,7 +138,9 @@ class StateManager {
             row: -1
         }, this.scroll = {
             horizontalBarPos: 0,
-            verticalBarPos: 0
+            verticalBarPos: 0,
+            frozenHorizontalBarPos: 0,
+            rightFrozenHorizontalBarPos: 0
         }, this.tablePosition = {
             absoluteX: 0,
             absoluteY: 0
@@ -184,13 +193,13 @@ class StateManager {
     setSortState(sortState) {
         const state = this;
         const sort = (sortState = !sortState || Array.isArray(sortState) ? sortState : [ sortState ]) && sortState.reduce(((prev, item) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e;
             const column = null === (_a = function(columns) {
                 const result = [];
                 return function flatten(cols, parentStartIndex = 0) {
                     cols.forEach((col => {
                         var _a;
-                        const startIndex = col.startInTotal ? null !== (_a = col.startInTotal + state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _a ? _a : 0 : parentStartIndex;
+                        const startIndex = col.startInTotal ? col.startInTotal + (null !== (_a = state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _a ? _a : 0) : parentStartIndex;
                         col.columns ? flatten(col.columns, startIndex) : result.push(Object.assign(Object.assign({}, col), {
                             startIndex: startIndex
                         }));
@@ -200,12 +209,12 @@ class StateManager {
             return this.table.internalProps.transpose ? prev.push({
                 field: item.field,
                 order: item.order,
-                row: null !== (_b = (null == column ? void 0 : column.startInTotal) + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _b ? _b : 0,
+                row: (null !== (_b = null == column ? void 0 : column.startInTotal) && void 0 !== _b ? _b : 0) + (null !== (_c = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _c ? _c : 0),
                 col: null == column ? void 0 : column.level
             }) : prev.push({
                 field: item.field,
                 order: item.order,
-                col: null !== (_c = (null == column ? void 0 : column.startInTotal) + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _c ? _c : 0,
+                col: (null !== (_d = null == column ? void 0 : column.startInTotal) && void 0 !== _d ? _d : 0) + (null !== (_e = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _e ? _e : 0),
                 row: null == column ? void 0 : column.level
             }), prev;
         }), []);
@@ -377,14 +386,46 @@ class StateManager {
                     }), 0);
                 })), void this._frozenObserver.observe(container);
             }
-            if (this.table.getColsWidth(0, originalFrozenColCount - 1) > this.table._getMaxFrozenWidth()) if (this.table.internalProps.unfreezeAllOnExceedsMaxWidth) this.table._setFrozenColCount(0), 
+            if (this.table.getColsWidth(0, originalFrozenColCount - 1) > this.table._getMaxFrozenWidth()) if (this.table.options.scrollFrozenCols) this.table.frozenColCount !== originalFrozenColCount && (this.table._setFrozenColCount(originalFrozenColCount), 
+            this.setFrozenCol(originalFrozenColCount)); else if (this.table.internalProps.unfreezeAllOnExceedsMaxWidth) this.table._setFrozenColCount(0), 
             this.setFrozenCol(-1); else {
                 const computedFrozenColCount = this.table._getComputedFrozenColCount(originalFrozenColCount);
                 this.table._setFrozenColCount(computedFrozenColCount), this.setFrozenCol(computedFrozenColCount);
             } else this.table.frozenColCount !== originalFrozenColCount && (this.table._setFrozenColCount(originalFrozenColCount), 
             this.setFrozenCol(originalFrozenColCount));
+            this.table.options.scrollFrozenCols && 0 !== this.table.getFrozenColsOffset() ? this.setFrozenColsScrollLeft(this.scroll.frozenHorizontalBarPos, !1) : this.setFrozenColsScrollLeft(0, !1), 
+            this.table.options.scrollRightFrozenCols && 0 !== this.table.getRightFrozenColsOffset() ? this.setRightFrozenColsScrollLeft(this.scroll.rightFrozenHorizontalBarPos, !1) : this.setRightFrozenColsScrollLeft(0, !1);
         } else this.clearFrozenObserver();
     }
+    setFrozenColsScrollLeft(left, triggerRender = !0) {
+        if (!this.table || !this.table.scenegraph) return;
+        const maxScrollLeft = this.table.getFrozenColsOffset();
+        if (left = Math.max(0, Math.min(left, maxScrollLeft)), left = Math.ceil(left), this.scroll.frozenHorizontalBarPos === left) return;
+        this.scroll.frozenHorizontalBarPos = left;
+        const ratio = maxScrollLeft ? left / maxScrollLeft : 0;
+        this.table.scenegraph.component.updateFrozenHorizontalScrollBarPos(ratio), triggerRender && this.table.scenegraph.setFrozenColsScrollLeft(left);
+    }
+    setRightFrozenColsScrollLeft(left, triggerRender = !0) {
+        if (!this.table || !this.table.scenegraph) return;
+        const maxScrollLeft = this.table.getRightFrozenColsOffset();
+        if (left = Math.max(0, Math.min(left, maxScrollLeft)), left = Math.ceil(left), this.scroll.rightFrozenHorizontalBarPos === left) return;
+        this.scroll.rightFrozenHorizontalBarPos = left;
+        const ratio = maxScrollLeft ? 1 - left / maxScrollLeft : 1;
+        this.table.scenegraph.component.updateRightFrozenHorizontalScrollBarPos(ratio), 
+        triggerRender && this.table.scenegraph.setRightFrozenColsScrollLeft(left);
+    }
+    updateFrozenHorizontalScrollBar(xRatio) {
+        var _a, _b, _c;
+        const maxScrollLeft = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0;
+        let left = Math.ceil(xRatio * maxScrollLeft);
+        (0, vutils_1.isValid)(left) && !isNaN(left) || (left = 0), this.setFrozenColsScrollLeft(left, !0);
+    }
+    updateRightFrozenHorizontalScrollBar(xRatio) {
+        var _a, _b, _c;
+        const maxScrollLeft = null !== (_c = null === (_b = (_a = this.table).getRightFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0;
+        let left = Math.ceil((1 - xRatio) * maxScrollLeft);
+        (0, vutils_1.isValid)(left) && !isNaN(left) || (left = 0), this.setRightFrozenColsScrollLeft(left, !0);
+    }
     clearFrozenObserver() {
         this._frozenObserver && (this._frozenObserver.disconnect(), this._frozenObserver = null);
     }
@@ -457,24 +498,24 @@ class StateManager {
         }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
     }
     updateHorizontalScrollBar(xRatio) {
-        var _a, _b, _c, _d;
-        const totalWidth = this.table.getAllColsWidth(), oldHorizontalBarPos = this.scroll.horizontalBarPos;
-        let horizontalBarPos = Math.ceil(xRatio * (totalWidth - this.table.scenegraph.width));
+        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);
+        let horizontalBarPos = Math.ceil(xRatio * scrollRange);
         (0, vutils_1.isValid)(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
         const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
         if (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CAN_SCROLL, {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
-            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,
+            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,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
             scrollRatioX: xRatio,
             dx: dx
         }).some((value => !1 === value))) {
-            const xRatio = this.scroll.horizontalBarPos / (totalWidth - this.table.scenegraph.width);
+            const xRatio = scrollRange ? this.scroll.horizontalBarPos / scrollRange : 0;
             this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
         } else this.scroll.horizontalBarPos = horizontalBarPos, this.table.scenegraph.setX(-this.scroll.horizontalBarPos, 1 === xRatio), 
         this.scroll.horizontalBarPos -= this.table.scenegraph.proxy.deltaX, this.table.scenegraph.proxy.deltaX = 0, 
@@ -482,8 +523,8 @@ class StateManager {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
-            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,
+            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,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -536,15 +577,13 @@ class StateManager {
         }), oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
     }
     setScrollLeft(left, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         if (!this.table || !this.table.scenegraph) return;
         this.table.scrollLeft;
-        const totalWidth = this.table.getAllColsWidth(), sizeTolerance = (this.table.getFrozenColsWidth(), 
-        (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0);
-        left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width - sizeTolerance)), 
-        left = Math.ceil(left);
-        const oldHorizontalBarPos = this.scroll.horizontalBarPos, xRatio = left / (totalWidth - this.table.scenegraph.width);
-        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) {
+        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;
+        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) {
             let horizontalBarPos = left;
             (0, vutils_1.isValid)(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
             const dx = horizontalBarPos - oldHorizontalBarPos;
@@ -552,15 +591,15 @@ class StateManager {
                 event: null == event ? void 0 : event.nativeEvent,
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: horizontalBarPos,
-                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,
+                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,
                 viewHeight: this.table.tableNoFrameHeight,
                 viewWidth: this.table.tableNoFrameWidth,
                 scrollDirection: "horizontal",
                 scrollRatioX: xRatio,
                 dx: dx
             }).some((value => !1 === value))) {
-                const xRatio = this.scroll.horizontalBarPos / (totalWidth - this.table.scenegraph.width);
+                const xRatio = scrollRange ? this.scroll.horizontalBarPos / scrollRange : 0;
                 return void this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
             }
         }
@@ -572,8 +611,8 @@ class StateManager {
             event: null == event ? void 0 : event.nativeEvent,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
-            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,
+            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,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -585,8 +624,8 @@ class StateManager {
         this.table.scenegraph.component.hideVerticalScrollBar();
     }
     showVerticalScrollBar(autoHide) {
-        this.table.scenegraph.component.showVerticalScrollBar(), autoHide && (clearTimeout(this._clearVerticalScrollBar), 
-        this._clearVerticalScrollBar = setTimeout((() => {
+        this.table.scenegraph.component.showVerticalScrollBar(), clearTimeout(this._clearVerticalScrollBar), 
+        autoHide && (this._clearVerticalScrollBar = setTimeout((() => {
             var _a;
             null === (_a = this.table.scenegraph) || void 0 === _a || _a.component.hideVerticalScrollBar();
         }), 1e3));
@@ -594,10 +633,10 @@ class StateManager {
     hideHorizontalScrollBar() {
         this.table.scenegraph.component.hideHorizontalScrollBar();
     }
-    showHorizontalScrollBar(autoHide) {
+    showHorizontalScrollBar(autoHide, target = "all") {
         var _a;
-        this.table.scenegraph.component.showHorizontalScrollBar(), null === (_a = this.table.scenegraph) || void 0 === _a || _a.component.showFrozenColumnShadow(), 
-        autoHide && (clearTimeout(this._clearHorizontalScrollBar), this._clearHorizontalScrollBar = setTimeout((() => {
+        this.table.scenegraph.component.showHorizontalScrollBar(target), null === (_a = this.table.scenegraph) || void 0 === _a || _a.component.showFrozenColumnShadow(), 
+        clearTimeout(this._clearHorizontalScrollBar), autoHide && (this._clearHorizontalScrollBar = setTimeout((() => {
             var _a, _b;
             null === (_a = this.table.scenegraph) || void 0 === _a || _a.component.hideFrozenColumnShadow(), 
             null === (_b = this.table.scenegraph) || void 0 === _b || _b.component.hideHorizontalScrollBar();
@@ -733,12 +772,15 @@ class StateManager {
         this.select.selectInline = selectInline;
     }
     updateSortState(sortState) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        sortState = Array.isArray(sortState) ? sortState : [ sortState ];
+        var _a, _b, _c, _d, _e, _f, _g;
+        const isSame = (sortState = Array.isArray(sortState) ? sortState : [ sortState ]).length === this.sort.length && sortState.every(((item, index) => {
+            var _a, _b;
+            return (null == item ? void 0 : item.field) === (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.field) && (null == item ? void 0 : item.order) === (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.order);
+        }));
+        if (isSame) return;
         for (let index = 0; index < sortState.length; index++) {
-            if (sortState[index].field === (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.field) && sortState[sortState.length - 1].order === (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.order)) return;
-            const oldSortCol = this.table.internalProps.multipleSort ? null : (null === (_c = this.sort[index]) || void 0 === _c ? void 0 : _c.col) || null, oldSortRow = this.table.internalProps.multipleSort ? null : (null === (_d = this.sort[index]) || void 0 === _d ? void 0 : _d.row) || null;
-            "asc" === (null === (_e = this.sort[index]) || void 0 === _e ? void 0 : _e.order) || (null === (_f = this.sort[index]) || void 0 === _f || _f.order);
+            const oldSortCol = this.table.internalProps.multipleSort ? null : (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.col) || null, oldSortRow = this.table.internalProps.multipleSort ? null : (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.row) || null;
+            "asc" === (null === (_c = this.sort[index]) || void 0 === _c ? void 0 : _c.order) || (null === (_d = this.sort[index]) || void 0 === _d || _d.order);
             this.setSortState(sortState.slice(0, index + 1));
             const cellAddress = this.table.internalProps.layoutMap.getHeaderCellAddressByField(sortState[index].field);
             this.sort[index].col = cellAddress.col, this.sort[index].row = cellAddress.row;
@@ -752,7 +794,7 @@ class StateManager {
                 order: this.sort[index].order,
                 oldSortCol: oldSortCol,
                 oldSortRow: oldSortRow,
-                oldIconMark: null === (_g = this.sort[index]) || void 0 === _g ? void 0 : _g.icon
+                oldIconMark: null === (_e = this.sort[index]) || void 0 === _e ? void 0 : _e.icon
             });
         }
         const normalHeaders = [];
@@ -766,7 +808,7 @@ class StateManager {
                 row: null,
                 iconMark: null,
                 order: null,
-                oldSortCol: null !== (_h = column.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _h ? _h : 0,
+                oldSortCol: (null !== (_f = column.startInTotal) && void 0 !== _f ? _f : 0) + (null !== (_g = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _g ? _g : 0),
                 oldSortRow: column.level,
                 oldIconMark: null
             });