k-vtable 1.0.34 → 1.0.36

package/es/event/listener/table-group.js

@@ -2,7 +2,7 @@ import { Gesture } from "./../../vrender";
 
 import { IconFuncTypeEnum, InteractionState } from "../../ts-types";
 
-import { getCellEventArgsSet, regIndexReg } from "../util";
+import { getCellEventArgsSetWithTable, regIndexReg } from "../util";
 
 import { TABLE_EVENT_TYPE } from "../../core/TABLE_EVENT_TYPE";
 
@@ -23,16 +23,17 @@ import { fireMoveColEventListeners } from "../helper";
 import { clearPageSelection } from "../../tools/env";
 
 export function bindTableGroupListener(eventManager) {
-    const table = eventManager.table, stateManager = table.stateManager;
+    var _a, _b, _c;
+    const table = eventManager.table, stateManager = table.stateManager, getEventArgsSet = e => getCellEventArgsSetWithTable(e, table);
     table.scenegraph.tableGroup.addEventListener("pointermove", (e => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         const lastX = null !== (_b = null === (_a = table.eventManager.LastPointerXY) || void 0 === _a ? void 0 : _a.x) && void 0 !== _b ? _b : e.x, lastY = null !== (_d = null === (_c = table.eventManager.LastPointerXY) || void 0 === _c ? void 0 : _c.y) && void 0 !== _d ? _d : e.y;
         table.eventManager.LastPointerXY = {
             x: e.x,
             y: e.y
         }, eventManager.touchSetTimeout && (clearTimeout(eventManager.touchSetTimeout), 
         eventManager.touchSetTimeout = void 0);
-        const eventArgsSet = getCellEventArgsSet(e);
+        const eventArgsSet = getEventArgsSet(e);
         if (eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.MOUSEMOVE_TABLE) && table.fireListeners(TABLE_EVENT_TYPE.MOUSEMOVE_TABLE, {
             col: eventArgsSet.eventArgs.col,
             row: eventArgsSet.eventArgs.row,
@@ -88,13 +89,17 @@ export function bindTableGroupListener(eventManager) {
                 mergeCellInfo: null === (_t = eventArgsSet.eventArgs) || void 0 === _t ? void 0 : _t.mergeInfo
             });
         }
+        if (table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.horizontalVisible || !table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.visible) {
+            const relativeX = e.x - table.tableX, target = table.options.scrollFrozenCols && (null === (_u = table.getFrozenColsOffset) || void 0 === _u ? void 0 : _u.call(table)) > 0 && relativeX >= 0 && relativeX < table.getFrozenColsWidth() ? "frozen" : table.options.scrollRightFrozenCols && (null === (_v = table.getRightFrozenColsOffset) || void 0 === _v ? void 0 : _v.call(table)) > 0 && relativeX > table.tableNoFrameWidth - table.getRightFrozenColsWidth() ? "rightFrozen" : "body";
+            stateManager.showHorizontalScrollBar(!1, target);
+        }
     })), table.scenegraph.tableGroup.addEventListener("pointerout", (e => {
         var _a;
-        const eventArgsSet = getCellEventArgsSet(e), cellGoup = null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target;
+        const eventArgsSet = getEventArgsSet(e), cellGoup = null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target;
         "table" === (null == cellGoup ? void 0 : cellGoup.role) && eventManager.dealTableHover();
     })), table.scenegraph.tableGroup.addEventListener("pointerover", (e => {
         var _a, _b;
-        const eventArgsSet = getCellEventArgsSet(e), cellGoup = null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target;
+        const eventArgsSet = getEventArgsSet(e), cellGoup = null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target;
         if (cellGoup && table.hasListeners(TABLE_EVENT_TYPE.MOUSEOVER_CHART_SYMBOL) && "symbol" === cellGoup.type) {
             const cellGroup = e.composedPath().find((p => "cell" === p.roll));
             if (cellGroup) {
@@ -118,15 +123,22 @@ export function bindTableGroupListener(eventManager) {
             }
         }
     })), table.scenegraph.tableGroup.addEventListener("pointerenter", (e => {
-        (table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.horizontalVisible || !table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.visible) && stateManager.showHorizontalScrollBar(), 
+        var _a, _b;
+        if (table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.horizontalVisible || !table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.visible) {
+            const relativeX = e.x - table.tableX, target = table.options.scrollFrozenCols && (null === (_a = table.getFrozenColsOffset) || void 0 === _a ? void 0 : _a.call(table)) > 0 && relativeX >= 0 && relativeX < table.getFrozenColsWidth() ? "frozen" : table.options.scrollRightFrozenCols && (null === (_b = table.getRightFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(table)) > 0 && relativeX > table.tableNoFrameWidth - table.getRightFrozenColsWidth() ? "rightFrozen" : "body";
+            stateManager.showHorizontalScrollBar(!1, target);
+        }
         (table.theme.scrollStyle.verticalVisible && "focus" === table.theme.scrollStyle.verticalVisible || !table.theme.scrollStyle.verticalVisible && "focus" === table.theme.scrollStyle.visible) && stateManager.showVerticalScrollBar(), 
         table.hasListeners(TABLE_EVENT_TYPE.MOUSEENTER_TABLE) && table.fireListeners(TABLE_EVENT_TYPE.MOUSEENTER_TABLE, {
             event: e.nativeEvent
         });
     })), table.scenegraph.tableGroup.addEventListener("pointerleave", (e => {
+        var _a, _b, _c;
         stateManager.isResizeCol() || stateManager.isResizeRow() || stateManager.isMoveCol() || stateManager.isSelecting() || (stateManager.updateInteractionState(InteractionState.default), 
-        stateManager.updateCursor()), (table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.horizontalVisible || !table.theme.scrollStyle.horizontalVisible && "focus" === table.theme.scrollStyle.visible) && stateManager.hideHorizontalScrollBar(), 
-        (table.theme.scrollStyle.verticalVisible && "focus" === table.theme.scrollStyle.verticalVisible || !table.theme.scrollStyle.verticalVisible && "focus" === table.theme.scrollStyle.visible) && stateManager.hideVerticalScrollBar(), 
+        stateManager.updateCursor());
+        const scrollStyle = table.theme.scrollStyle, horizontalVisible = null !== (_a = null == scrollStyle ? void 0 : scrollStyle.horizontalVisible) && void 0 !== _a ? _a : null == scrollStyle ? void 0 : scrollStyle.visible, verticalVisible = null !== (_b = null == scrollStyle ? void 0 : scrollStyle.verticalVisible) && void 0 !== _b ? _b : null == scrollStyle ? void 0 : scrollStyle.visible, barToSide = null !== (_c = null == scrollStyle ? void 0 : scrollStyle.barToSide) && void 0 !== _c && _c;
+        barToSide || "focus" !== horizontalVisible || stateManager.hideHorizontalScrollBar(), 
+        barToSide || "focus" !== verticalVisible || stateManager.hideVerticalScrollBar(), 
         table.hasListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL) && -1 !== table.stateManager.hover.cellPos.col && -1 !== table.stateManager.hover.cellPos.row && table.fireListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL, {
             col: table.stateManager.hover.cellPos.col,
             row: table.stateManager.hover.cellPos.row,
@@ -153,7 +165,7 @@ export function bindTableGroupListener(eventManager) {
             x: e.x,
             y: e.y
         }, 0 !== e.button) return;
-        const eventArgsSet = getCellEventArgsSet(e);
+        const eventArgsSet = getEventArgsSet(e);
         if (eventManager.downIcon = void 0, stateManager.interactionState !== InteractionState.default) return;
         if (table.isPivotChart() && "chart" !== (null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target.type) && (table.scenegraph.updateChartState(null, void 0), 
         table.scenegraph.deactivateChart(-1, -1, !0)), (null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target) !== (null === (_c = stateManager.residentHoverIcon) || void 0 === _c ? void 0 : _c.icon) && stateManager.hideMenu(), 
@@ -194,7 +206,7 @@ export function bindTableGroupListener(eventManager) {
                 }
             }
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL)) {
-                const eventArgsSet = getCellEventArgsSet(e);
+                const eventArgsSet = getEventArgsSet(e);
                 eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL, {
                     col: eventArgsSet.eventArgs.col,
                     row: eventArgsSet.eventArgs.row,
@@ -213,7 +225,7 @@ export function bindTableGroupListener(eventManager) {
                     fireMoveColEventListeners(table, endMoveColSuccess, e.nativeEvent);
                 } else if (stateManager.isSelecting()) {
                     table.stateManager.endSelectCells(), table.stateManager.isFillHandle() && table.stateManager.endFillSelect();
-                    const eventArgsSet = getCellEventArgsSet(e);
+                    const eventArgsSet = getEventArgsSet(e);
                     if (table.eventManager.isDraging && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
                         const cellsEvent = {
                             event: e.nativeEvent,
@@ -229,7 +241,7 @@ export function bindTableGroupListener(eventManager) {
                 }
             } else stateManager.interactionState === InteractionState.scrolling && stateManager.updateInteractionState(InteractionState.default);
             if (!table.eventManager.isDraging) {
-                const eventArgsSet = getCellEventArgsSet(e);
+                const eventArgsSet = getEventArgsSet(e);
                 if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
                     const {col: col, row: row} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row);
                     let icon, position;
@@ -253,7 +265,7 @@ export function bindTableGroupListener(eventManager) {
                 }
             }
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL)) {
-                const eventArgsSet = getCellEventArgsSet(e);
+                const eventArgsSet = getEventArgsSet(e);
                 eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL, {
                     col: eventArgsSet.eventArgs.col,
                     row: eventArgsSet.eventArgs.row,
@@ -269,7 +281,7 @@ export function bindTableGroupListener(eventManager) {
         }
     })), table.scenegraph.tableGroup.addEventListener("rightdown", (e => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        const eventArgsSet = getCellEventArgsSet(e);
+        const eventArgsSet = getEventArgsSet(e);
         if (eventArgsSet.eventArgs) {
             stateManager.triggerContextMenu(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
             const {col: col, row: row} = eventArgsSet.eventArgs;
@@ -311,10 +323,10 @@ export function bindTableGroupListener(eventManager) {
     })), table.scenegraph.tableGroup.addEventListener("pointertap", (e => {
         var _a;
         if (table.stateManager.columnResize.resizing) return;
-        const eventArgsSet = getCellEventArgsSet(e);
+        const eventArgsSet = getEventArgsSet(e);
         if (!table.stateManager.columnResize.resizing && !table.stateManager.columnMove.moving && (eventManager.dealIconClick(e, eventArgsSet), 
         (null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) && eventManager.touchSetTimeout && "touch" === e.pointerType)) {
-            const eventArgsSet = getCellEventArgsSet(e);
+            const eventArgsSet = getEventArgsSet(e);
             if (eventManager.touchSetTimeout) {
                 clearTimeout(eventManager.touchSetTimeout);
                 const isHasSelected = !!(null === (_a = stateManager.select.ranges) || void 0 === _a ? void 0 : _a.length);
@@ -324,7 +336,7 @@ export function bindTableGroupListener(eventManager) {
         }
     })), table.scenegraph.stage.addEventListener("pointerdown", (e => {
         var _a, _b, _c, _d;
-        const eventArgsSet = getCellEventArgsSet(e);
+        const eventArgsSet = getCellEventArgsSetWithTable(e, table);
         (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) && (null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target) === (null === (_c = stateManager.residentHoverIcon) || void 0 === _c ? void 0 : _c.icon) || stateManager.hideMenu();
         let isCompleteEdit = !1;
         const target = e.target;
@@ -357,13 +369,30 @@ export function bindTableGroupListener(eventManager) {
             stateManager.endSelectCells(!0, isHasSelected), stateManager.updateCursor(), table.scenegraph.updateChartState(null, void 0), 
             table.scenegraph.deactivateChart(-1, -1, !0);
         }
-    })), table.scenegraph.stage.addEventListener("pointermove", (e => {
+    }));
+    const scrollStyle = table.theme.scrollStyle, barToSide = null !== (_a = null == scrollStyle ? void 0 : scrollStyle.barToSide) && void 0 !== _a && _a, horizontalVisible = null !== (_b = null == scrollStyle ? void 0 : scrollStyle.horizontalVisible) && void 0 !== _b ? _b : null == scrollStyle ? void 0 : scrollStyle.visible, verticalVisible = null !== (_c = null == scrollStyle ? void 0 : scrollStyle.verticalVisible) && void 0 !== _c ? _c : null == scrollStyle ? void 0 : scrollStyle.visible, shouldShowScrollOnCanvasHover = barToSide && "focus" === horizontalVisible, shouldShowVScrollOnCanvasHover = barToSide && "focus" === verticalVisible;
+    (shouldShowScrollOnCanvasHover || shouldShowVScrollOnCanvasHover) && (table.scenegraph.stage.addEventListener("pointerenter", (e => {
+        var _a, _b, _c;
+        const target = e.target;
+        if (target === table.scenegraph.stage || (null === (_a = null == target ? void 0 : target.isDescendantsOf) || void 0 === _a ? void 0 : _a.call(target, table.scenegraph.stage))) {
+            if (shouldShowScrollOnCanvasHover) {
+                const relativeX = e.x - table.tableX, target = table.options.scrollFrozenCols && (null === (_b = table.getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(table)) > 0 && relativeX >= 0 && relativeX < table.getFrozenColsWidth() ? "frozen" : table.options.scrollRightFrozenCols && (null === (_c = table.getRightFrozenColsOffset) || void 0 === _c ? void 0 : _c.call(table)) > 0 && relativeX > table.tableNoFrameWidth - table.getRightFrozenColsWidth() ? "rightFrozen" : "body";
+                stateManager.showHorizontalScrollBar(!1, target);
+            }
+            shouldShowVScrollOnCanvasHover && stateManager.showVerticalScrollBar();
+        }
+    })), table.scenegraph.stage.addEventListener("pointerleave", (e => {
+        var _a;
+        const relatedTarget = e.relatedTarget;
+        (!relatedTarget || relatedTarget !== table.scenegraph.stage && !(null === (_a = relatedTarget.isDescendantsOf) || void 0 === _a ? void 0 : _a.call(relatedTarget, table.scenegraph.stage))) && (shouldShowScrollOnCanvasHover && stateManager.hideHorizontalScrollBar(), 
+        shouldShowVScrollOnCanvasHover && stateManager.hideVerticalScrollBar());
+    }))), table.scenegraph.stage.addEventListener("pointermove", (e => {
         var _a, _b, _c;
-        const eventArgsSet = getCellEventArgsSet(e);
+        const eventArgsSet = getCellEventArgsSetWithTable(e, table);
         null !== (_c = null === (_b = null === (_a = e.target) || void 0 === _a ? void 0 : _a.isDescendantsOf) || void 0 === _b ? void 0 : _b.call(_a, table.scenegraph.tableGroup)) && void 0 !== _c && _c && (stateManager.isResizeCol() || eventManager.checkColumnResize(eventArgsSet) ? table.stateManager.select && eventManager.checkCellFillhandle(eventArgsSet) ? stateManager.updateCursor("crosshair") : stateManager.updateCursor("col-resize") : stateManager.isResizeRow() || eventManager.checkRowResize(eventArgsSet) ? table.stateManager.select && eventManager.checkCellFillhandle(eventArgsSet) ? stateManager.updateCursor("crosshair") : stateManager.updateCursor("row-resize") : stateManager.isMoveCol() || stateManager.updateCursor());
     })), table.scenegraph.tableGroup.addEventListener("checkbox_state_change", (e => {
         var _a, _b;
-        const eventArgsSet = getCellEventArgsSet(e), {col: col, row: row} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row), mergeRange = getCellMergeInfo(table, col, row);
+        const eventArgsSet = getEventArgsSet(e), {col: col, row: row} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row), mergeRange = getCellMergeInfo(table, col, row);
         if (mergeRange) for (let col = mergeRange.start.col; col <= mergeRange.end.col; col++) for (let row = mergeRange.start.row; row <= mergeRange.end.row; row++) {
             table.scenegraph.getCell(col, row).forEachChildren((checkbox => {
                 "checkbox" === checkbox.name && checkbox.setAttributes({
@@ -393,7 +422,7 @@ export function bindTableGroupListener(eventManager) {
         table.fireListeners(TABLE_EVENT_TYPE.CHECKBOX_STATE_CHANGE, cellsEvent), table.scenegraph.updateNextFrame();
     })), table.scenegraph.tableGroup.addEventListener("radio_checked", (e => {
         var _a, _b, _c;
-        const eventArgsSet = getCellEventArgsSet(e), {col: col, row: row, target: target} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row), indexInCell = null === (_a = regIndexReg.exec(target.id)) || void 0 === _a ? void 0 : _a[1], mergeRange = getCellMergeInfo(table, col, row);
+        const eventArgsSet = getEventArgsSet(e), {col: col, row: row, target: target} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row), indexInCell = null === (_a = regIndexReg.exec(target.id)) || void 0 === _a ? void 0 : _a[1], mergeRange = getCellMergeInfo(table, col, row);
         if (mergeRange) for (let col = mergeRange.start.col; col <= mergeRange.end.col; col++) for (let row = mergeRange.start.row; row <= mergeRange.end.row; row++) {
             table.scenegraph.getCell(col, row).forEachChildren((radio => {
                 "radio" === radio.name && radio.id === target.id && radio.setAttributes({
@@ -434,7 +463,7 @@ export function bindTableGroupListener(eventManager) {
         table.fireListeners(TABLE_EVENT_TYPE.RADIO_STATE_CHANGE, cellsEvent), table.scenegraph.updateNextFrame();
     })), table.scenegraph.tableGroup.addEventListener("switch_state_change", (e => {
         var _a, _b;
-        const eventArgsSet = getCellEventArgsSet(e), {col: col, row: row, target: target} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row), mergeRange = getCellMergeInfo(table, col, row);
+        const eventArgsSet = getEventArgsSet(e), {col: col, row: row, target: target} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row), mergeRange = getCellMergeInfo(table, col, row);
         if (mergeRange) for (let col = mergeRange.start.col; col <= mergeRange.end.col; col++) for (let row = mergeRange.start.row; row <= mergeRange.end.row; row++) {
             table.scenegraph.getCell(col, row).forEachChildren((switchComponent => {
                 "switch" === switchComponent.name && switchComponent.setAttributes({
@@ -490,7 +519,8 @@ export function endResizeRow(table) {
 
 function dblclickHandler(e, table) {
     var _a, _b, _c, _d, _e, _f;
-    const eventArgsSet = getCellEventArgsSet(e);
+    if ("number" == typeof e.button && 0 !== e.button) return;
+    const eventArgsSet = getCellEventArgsSetWithTable(e, table);
     let col = -1, row = -1;
     eventArgsSet.eventArgs && (col = eventArgsSet.eventArgs.col, row = eventArgsSet.eventArgs.row);
     const value = table.getCellValue(col, row), bounds = null === (_b = null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.targetCell) || void 0 === _b ? void 0 : _b.globalAABBBounds;