@visactor/vtable-calendar 1.26.1 → 1.26.2-none

package/dist/vtable-calendar.js

@@ -50872,7 +50872,7 @@
               col: col,
               row: row
             };
-            enableShiftSelectMode || (currentRange.end = currentRange.start), scenegraph.deleteLastSelectedRangeComponents(), scenegraph.updateCellSelectBorder(currentRange);
+            enableShiftSelectMode || (currentRange.end = currentRange.start), cellPos.col = col, cellPos.row = row, scenegraph.deleteLastSelectedRangeComponents(), scenegraph.updateCellSelectBorder(currentRange);
           } else {
             let extendSelectRange = !isValid$1(skipBodyMerge) || !skipBodyMerge;
             if (-1 === cellPos.col || -1 === cellPos.row || enableCtrlSelectMode || (state.select.ranges = [], scenegraph.deleteAllSelectBorder()), "cell" !== state.select.headerSelectMode && table.isColumnHeader(col, row)) {
@@ -54559,13 +54559,14 @@
       }
       cellIsHeaderCheck(eventArgsSet, update) {
         const {
-            eventArgs: eventArgs
-          } = eventArgsSet,
-          {
-            col: col,
-            row: row,
-            target: target
-          } = eventArgs;
+          eventArgs: eventArgs
+        } = eventArgsSet;
+        if (!eventArgs) return !1;
+        const {
+          col: col,
+          row: row,
+          target: target
+        } = eventArgs;
         if (!this.table.isHeader(col, row)) return !1;
         return "checkbox" === this.table.getCellType(eventArgs.col, eventArgs.row) && "checkbox" === target.name;
       }
@@ -57158,7 +57159,7 @@
       }
       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._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.1", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
+        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.26.2-none", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
           const g = window;
           g[this.id] = this;
           const registry = g.__vtable__ || (g.__vtable__ = {
@@ -58008,22 +58009,20 @@
         return count;
       }
       getBodyVisibleCellRange() {
+        var _a, _b, _c, _d;
         const {
             scrollTop: scrollTop,
             scrollLeft: scrollLeft
           } = this,
-          frozenRowsHeight = this.getFrozenRowsHeight(),
           frozenColsContentWidth = this.getFrozenColsContentWidth(),
           frozenColsOffset = this.getFrozenColsOffset(),
           bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(),
           rightFrozenColsWidth = this.getRightFrozenColsWidth(),
-          {
-            row: rowStart
-          } = this.getRowAt(scrollTop + frozenRowsHeight + 1),
+          rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount),
           {
             col: colStart
           } = this.getColAt(scrollLeft + frozenColsContentWidth + 1),
-          rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? this.getRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight).row : this.rowCount - 1,
+          rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1,
           colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
         return colEnd < 0 || rowEnd < 0 ? null : {
           rowStart: rowStart,
@@ -58033,15 +58032,13 @@
         };
       }
       getBodyVisibleRowRange(start_deltaY = 0, end_deltaY = 0) {
+        var _a, _b, _c, _d;
         const {
             scrollTop: scrollTop
           } = this,
-          frozenRowsHeight = this.getFrozenRowsHeight(),
           bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(),
-          {
-            row: rowStart
-          } = this.getRowAt(scrollTop + frozenRowsHeight + 1 + start_deltaY),
-          rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? this.getRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight + end_deltaY).row : this.rowCount - 1;
+          rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1 + start_deltaY)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount),
+          rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight + end_deltaY)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1;
         return rowEnd < 0 ? null : {
           rowStart: rowStart,
           rowEnd: rowEnd
@@ -60722,7 +60719,7 @@
         return !1;
       }
       moveHeaderPosition(source, target) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         if ((!(null === (_a = this._table.options.dragOrder) || void 0 === _a ? void 0 : _a.validateDragOrderOnEnd) || (null === (_b = this._table.options.dragOrder) || void 0 === _b ? void 0 : _b.validateDragOrderOnEnd(source, target))) && this.canMoveHeaderPosition(source, target)) {
           let sourceCellRange = this.getCellRange(source.col, source.row);
           if (this.isColumnHeader(source.col, source.row) || "column" === this._table.stateManager.columnMove.movingColumnOrRow && 0 === source.row) {
@@ -60742,9 +60739,13 @@
                 sourceData.unshift(targetIndex - this.leftRowSeriesNumberColumnCount, 0), Array.prototype.splice.apply(rowRecords, sourceData);
               }
             }
-            const sourceColumns = this._columns.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
-            if (sourceColumns.unshift(targetIndex - this.leftRowSeriesNumberColumnCount, 0), Array.prototype.splice.apply(this._columns, sourceColumns), null === (_f = this._table.options.dragOrder) || void 0 === _f ? void 0 : _f.maintainArrayDataOrder) for (let i = 0; i < this._columns.length; i++) this._columns[i].field = i;
-            if (this.columnTree.movePosition(sourceCellRange.start.row, sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, targetIndex - this.leftRowSeriesNumberColumnCount), null === (_g = this._table.options.dragOrder) || void 0 === _g ? void 0 : _g.maintainArrayDataOrder) for (let i = 0; i < this.columnTree.tree.children.length; i++) this.columnTree.tree.children[i].field = i;
+            const sourceColIndex = sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount,
+              targetColIndex = target.col >= source.col ? targetCellRange.end.col - this.leftRowSeriesNumberColumnCount : targetCellRange.start.col - this.leftRowSeriesNumberColumnCount,
+              sourceTotalIndex = null !== (_h = null === (_g = null === (_f = this._columns[sourceColIndex]) || void 0 === _f ? void 0 : _f.define) || void 0 === _g ? void 0 : _g.startInTotal) && void 0 !== _h ? _h : sourceColIndex,
+              targetTotalIndex = null !== (_l = null === (_k = null === (_j = this._columns[targetColIndex]) || void 0 === _j ? void 0 : _j.define) || void 0 === _k ? void 0 : _k.startInTotal) && void 0 !== _l ? _l : targetColIndex,
+              sourceColumns = this._columns.splice(sourceColIndex, sourceSize);
+            if (sourceColumns.unshift(targetIndex - this.leftRowSeriesNumberColumnCount, 0), Array.prototype.splice.apply(this._columns, sourceColumns), null === (_m = this._table.options.dragOrder) || void 0 === _m ? void 0 : _m.maintainArrayDataOrder) for (let i = 0; i < this._columns.length; i++) this._columns[i].field = i;
+            if (this.columnTree.movePosition(sourceCellRange.start.row, sourceTotalIndex, targetTotalIndex), null === (_o = this._table.options.dragOrder) || void 0 === _o ? void 0 : _o.maintainArrayDataOrder) for (let i = 0; i < this.columnTree.tree.children.length; i++) this.columnTree.tree.children[i].field = i;
             return this.columnTree.reset(this.columnTree.tree.children), this._cellRangeMap = new Map(), {
               sourceIndex: sourceCellRange.start.col,
               targetIndex: targetIndex,
@@ -60763,8 +60764,12 @@
               const sourceIds = this._headerCellIds[row].splice(sourceCellRange.start.row, sourceSize);
               sourceIds.unshift(targetIndex, 0), Array.prototype.splice.apply(this._headerCellIds[row], sourceIds);
             }
-            const sourceColumns = this._columns.splice(sourceCellRange.start.row, sourceSize);
-            return sourceColumns.unshift(targetIndex, 0), Array.prototype.splice.apply(this._columns, sourceColumns), this.columnTree.movePosition(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceCellRange.start.row, targetIndex + (target.row > source.row ? sourceCellRange.end.row - sourceCellRange.start.row : 0)), this.columnTree.reset(this.columnTree.tree.children), this._cellRangeMap = new Map(), {
+            const sourceRowIndex = sourceCellRange.start.row,
+              targetRowIndex = target.row >= source.row ? targetCellRange.end.row : targetCellRange.start.row,
+              sourceTotalIndex = null !== (_r = null === (_q = null === (_p = this._columns[sourceRowIndex]) || void 0 === _p ? void 0 : _p.define) || void 0 === _q ? void 0 : _q.startInTotal) && void 0 !== _r ? _r : sourceRowIndex,
+              targetTotalIndex = null !== (_u = null === (_t = null === (_s = this._columns[targetRowIndex]) || void 0 === _s ? void 0 : _s.define) || void 0 === _t ? void 0 : _t.startInTotal) && void 0 !== _u ? _u : targetRowIndex,
+              sourceColumns = this._columns.splice(sourceRowIndex, sourceSize);
+            return sourceColumns.unshift(targetIndex, 0), Array.prototype.splice.apply(this._columns, sourceColumns), this.columnTree.movePosition(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceTotalIndex, targetTotalIndex), this.columnTree.reset(this.columnTree.tree.children), this._cellRangeMap = new Map(), {
               sourceIndex: sourceCellRange.start.row,
               targetIndex: targetIndex,
               sourceSize: sourceSize,
@@ -62297,7 +62302,16 @@
         const sourceCellRange = this.getCellRange(source.col, source.row),
           targetCellRange = this.getCellRange(target.col, target.row),
           moveContext = this.internalProps.layoutMap.moveHeaderPosition(source, target);
-        return moveContext ? ("column" === moveContext.moveType ? (this.colWidthsMap.exchangeOrder(sourceCellRange.start.col, sourceCellRange.end.col - sourceCellRange.start.col + 1, targetCellRange.start.col, targetCellRange.end.col - targetCellRange.start.col + 1, moveContext.targetIndex), adjustWidthResizedColMap(moveContext, this), this.transpose || (this.colWidthsLimit = {}, this.setMinMaxLimitWidth())) : (moveContext.targetIndex > moveContext.sourceIndex ? this.rowHeightsMap.exchangeOrder(moveContext.sourceIndex, moveContext.sourceSize, moveContext.targetIndex + moveContext.sourceSize - moveContext.targetSize, moveContext.targetSize, moveContext.targetIndex) : this.rowHeightsMap.exchangeOrder(moveContext.sourceIndex, moveContext.sourceSize, moveContext.targetIndex, moveContext.targetSize, moveContext.targetIndex), adjustHeightResizedRowMap(moveContext, this)), moveContext) : null;
+        return moveContext ? ("column" === moveContext.moveType ? (this.colWidthsMap.exchangeOrder(sourceCellRange.start.col, sourceCellRange.end.col - sourceCellRange.start.col + 1, targetCellRange.start.col, targetCellRange.end.col - targetCellRange.start.col + 1, moveContext.targetIndex), adjustWidthResizedColMap(moveContext, this), this.transpose || (this.colWidthsLimit = {}, this.setMinMaxLimitWidth())) : (moveContext.targetIndex > moveContext.sourceIndex ? this.rowHeightsMap.exchangeOrder(moveContext.sourceIndex, moveContext.sourceSize, moveContext.targetIndex + moveContext.sourceSize - moveContext.targetSize, moveContext.targetSize, moveContext.targetIndex) : this.rowHeightsMap.exchangeOrder(moveContext.sourceIndex, moveContext.sourceSize, moveContext.targetIndex, moveContext.targetSize, moveContext.targetIndex), adjustHeightResizedRowMap(moveContext, this)), this.syncColumnsStateFromLayoutMap(), moveContext) : null;
+      }
+      syncColumnsStateFromLayoutMap() {
+        const nextColumns = cloneDeepSpec(this.internalProps.columns, ["children"]),
+          cleanColumns = columns => {
+            columns.forEach(col => {
+              delete col.level, delete col.size, delete col.startInTotal, delete col.startIndex, delete col.id, delete col.hierarchyState, col.columns && cleanColumns(col.columns);
+            });
+          };
+        cleanColumns(nextColumns), this.options.columns = nextColumns, this.options.header && (this.options.header = nextColumns);
       }
       changeRecordOrder(sourceIndex, targetIndex) {
         this.transpose ? (sourceIndex = this.getRecordShowIndexByCell(sourceIndex, 0), targetIndex = this.getRecordShowIndexByCell(targetIndex, 0)) : (sourceIndex = this.getRecordShowIndexByCell(0, sourceIndex), targetIndex = this.getRecordShowIndexByCell(0, targetIndex)), this.dataSource.changeOrder(sourceIndex, targetIndex);
@@ -65066,15 +65080,22 @@
           cursor: "pointer"
         });
         colHeaderGroup.add(hackBorder), colHeaderGroup.border = hackBorder, hackBorder.attachShadow(hackBorder.shadowRoot), hackBorder.name = "border-rect", hackBorder.addEventListener("click", e => {
+          var _a, _b;
           const titleRows = table.listTreeStickCellPlugin.titleRows,
             {
               shadowTarget: shadowTarget
             } = e.pickParams,
-            cellGroup = getTargetCell(shadowTarget),
-            {
-              col: col,
-              row: row
-            } = cellGroup;
+            cellGroup = getTargetCell(shadowTarget);
+          if (!cellGroup) return;
+          const iconInfo = getIconAndPositionFromTarget(shadowTarget),
+            funcType = null === (_b = null === (_a = null == iconInfo ? void 0 : iconInfo.icon) || void 0 === _a ? void 0 : _a.attribute) || void 0 === _b ? void 0 : _b.funcType;
+          if (funcType === IconFuncTypeEnum.collapse || funcType === IconFuncTypeEnum.expand) {
+            const stickCellTop = getStickCellTop(cellGroup, table);
+            return table.toggleHierarchyState(cellGroup.col, cellGroup.row), void keepRowAtVisiblePosition(cellGroup.col, cellGroup.row, stickCellTop, table);
+          }
+          const {
+            row: row
+          } = cellGroup;
           scrollToRow(row - titleRows.indexOf(row), table);
         });
       }
@@ -65087,15 +65108,22 @@
           cursor: "pointer"
         });
         cornerHeaderGroup.add(hackBorder), cornerHeaderGroup.border = hackBorder, hackBorder.attachShadow(hackBorder.shadowRoot), hackBorder.name = "border-rect", hackBorder.addEventListener("click", e => {
+          var _a, _b;
           const titleRows = table.listTreeStickCellPlugin.titleRows,
             {
               shadowTarget: shadowTarget
             } = e.pickParams,
-            cellGroup = getTargetCell(shadowTarget),
-            {
-              col: col,
-              row: row
-            } = cellGroup;
+            cellGroup = getTargetCell(shadowTarget);
+          if (!cellGroup) return;
+          const iconInfo = getIconAndPositionFromTarget(shadowTarget),
+            funcType = null === (_b = null === (_a = null == iconInfo ? void 0 : iconInfo.icon) || void 0 === _a ? void 0 : _a.attribute) || void 0 === _b ? void 0 : _b.funcType;
+          if (funcType === IconFuncTypeEnum.collapse || funcType === IconFuncTypeEnum.expand) {
+            const stickCellTop = getStickCellTop(cellGroup, table);
+            return table.toggleHierarchyState(cellGroup.col, cellGroup.row), void keepRowAtVisiblePosition(cellGroup.col, cellGroup.row, stickCellTop, table);
+          }
+          const {
+            row: row
+          } = cellGroup;
           scrollToRow(row - titleRows.indexOf(row), table);
         });
       }
@@ -65115,6 +65143,15 @@
       }
       table.scenegraph.updateNextFrame();
     }
+    function getStickCellTop(cellGroup, table) {
+      var _a, _b;
+      return table.getFrozenRowsHeight() + (null !== (_b = null === (_a = cellGroup.attribute) || void 0 === _a ? void 0 : _a.y) && void 0 !== _b ? _b : 0);
+    }
+    function keepRowAtVisiblePosition(col, row, visibleTop, table) {
+      const drawRange = table.getDrawRange(),
+        targetScrollTop = Math.max(0, Math.min(table.getCellRect(col, row).top - visibleTop, table.getAllRowsHeight() - drawRange.height));
+      table.scrollTop = targetScrollTop, table.scenegraph.updateNextFrame();
+    }
     const registerListTreeStickCellPlugin = () => {
       Factory.registerComponent("listTreeStickCellPlugin", ListTreeStickCellPlugin);
     };