@visactor/vtable-calendar 1.19.7 → 1.19.8

package/dist/vtable-calendar.js

@@ -43689,7 +43689,7 @@
         textAlign,
         textBaseline,
         y = 0;
-      columnGroup.lastChild && columnGroup.lastChild.row === rowStart - 1 ? y = columnGroup.lastChild.attribute.y + columnGroup.lastChild.attribute.height : columnGroup.colHeight && (y = columnGroup.colHeight);
+      columnGroup.lastChild && columnGroup.lastChild.row === rowStart - 1 ? y = columnGroup.lastChild.attribute.y + columnGroup.lastChild.attribute.height : columnGroup.colHeight ? y = columnGroup.colHeight : rowStart >= table.columnHeaderLevelCount && rowStart < table.rowCount - table.bottomFrozenRowCount && (y = table.getRowsHeight(table.columnHeaderLevelCount, rowStart - 1));
       for (let j = rowStart; j <= rowEnd; j++) {
         const row = j;
         let range,
@@ -49827,25 +49827,40 @@
             col: col,
             row: row
           } = eventArgsSet.eventArgs;
-          if (table.hasListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL)) {
-            const cellInfo = table.getCellInfo(col, row);
-            let icon, position;
-            if (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) {
-              const iconInfo = getIconAndPositionFromTarget(null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target);
-              iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
+          if (col >= 0 && row >= 0) {
+            const ranges = table.getSelectedCellRanges();
+            let cellInRange = !1;
+            if (ranges.length > 0) for (let i = 0; i < ranges.length; i++) {
+              const range = ranges[i],
+                startCol = range.start.col,
+                endCol = range.end.col,
+                startRow = range.start.row,
+                endRow = range.end.row;
+              if (col >= startCol && col <= endCol && row >= startRow && row <= endRow || col >= endCol && col <= startCol && row >= endRow && row <= startRow || col >= startCol && col <= endCol && row >= endRow && row <= startRow || col >= endCol && col <= startCol && row >= startRow && row <= endRow) {
+                cellInRange = !0;
+                break;
+              }
+            }
+            if (cellInRange || table.selectCell(col, row), table.hasListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL)) {
+              const cellInfo = table.getCellInfo(col, row);
+              let icon, position;
+              if (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) {
+                const iconInfo = getIconAndPositionFromTarget(null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target);
+                iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
+              }
+              const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
+                event: e.nativeEvent,
+                cells: [],
+                targetIcon: icon ? {
+                  name: icon.name,
+                  position: position,
+                  funcType: icon.attribute.funcType
+                } : void 0,
+                target: null === (_c = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target,
+                mergeCellInfo: null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.mergeInfo
+              });
+              (null === (_f = null === (_e = table.options.eventOptions) || void 0 === _e ? void 0 : _e.contextmenuReturnAllSelectedCells) || void 0 === _f || _f) && (cellInRanges(table.stateManager.select.ranges, col, row) ? cellsEvent.cells = table.getSelectedCellInfos() : cellsEvent.cells = [[cellInfo]]), table.fireListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, cellsEvent);
             }
-            const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
-              event: e.nativeEvent,
-              cells: [],
-              targetIcon: icon ? {
-                name: icon.name,
-                position: position,
-                funcType: icon.attribute.funcType
-              } : void 0,
-              target: null === (_c = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target,
-              mergeCellInfo: null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.mergeInfo
-            });
-            (null === (_f = null === (_e = table.options.eventOptions) || void 0 === _e ? void 0 : _e.contextmenuReturnAllSelectedCells) || void 0 === _f || _f) && (cellInRanges(table.stateManager.select.ranges, col, row) ? cellsEvent.cells = table.getSelectedCellInfos() : cellsEvent.cells = [[cellInfo]]), table.fireListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, cellsEvent);
           }
         }
       }), table.scenegraph.tableGroup.addEventListener("pointertap", e => {
@@ -50919,29 +50934,6 @@
       });
     }
 
-    function rightButtonClickEvent(table) {
-      table.on(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, e => {
-        const {
-            col: col,
-            row: row
-          } = e,
-          ranges = table.getSelectedCellRanges();
-        let cellInRange = !1;
-        if (ranges.length > 0) for (let i = 0; i < ranges.length; i++) {
-          const range = ranges[i],
-            startCol = range.start.col,
-            endCol = range.end.col,
-            startRow = range.start.row,
-            endRow = range.end.row;
-          if (col >= startCol && col <= endCol && row >= startRow && row <= endRow || col >= endCol && col <= startCol && row >= endRow && row <= startRow || col >= startCol && col <= endCol && row >= endRow && row <= startRow || col >= endCol && col <= startCol && row >= startRow && row <= endRow) {
-            cellInRange = !0;
-            break;
-          }
-        }
-        cellInRange || table.selectCell(col, row);
-      });
-    }
-
     class EventManager {
       constructor(table) {
         this.isDown = !1, this.isDraging = !1, this.globalEventListeners = [], this._enableTableScroll = !0, this.table = table, this.handleTextStickBindId = [], this.inertiaScroll = new InertiaScroll(table.stateManager), "node" === Env.mode || table.options.disableInteraction || (this.bindOuterEvent(), setTimeout(() => {
@@ -50966,7 +50958,7 @@
         }, 0);
       }
       bindSelfEvent() {
-        this.table.isReleased || (bindIconClickEvent(this.table), bindDropdownMenuEvent(this.table), this.updateEventBinder(), bindMediaClick(this.table), bindDBClickAutoColumnWidthEvent(this.table), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindGroupCheckboxTreeChange(this.table), bindHeaderCheckboxChange(this.table), bindButtonClickEvent(this.table), rightButtonClickEvent(this.table));
+        this.table.isReleased || (bindIconClickEvent(this.table), bindDropdownMenuEvent(this.table), this.updateEventBinder(), bindMediaClick(this.table), bindDBClickAutoColumnWidthEvent(this.table), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindGroupCheckboxTreeChange(this.table), bindHeaderCheckboxChange(this.table), bindButtonClickEvent(this.table));
       }
       dealTableHover(eventArgsSet) {
         if (!eventArgsSet) return void this.table.stateManager.updateHoverPos(-1, -1);
@@ -53790,7 +53782,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.version = "1.19.7", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === 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.version = "1.19.8", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === 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 PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container