@visactor/vtable-gantt 1.17.7 → 1.18.1-alpha.0

package/cjs/index.d.ts

@@ -5,5 +5,5 @@ import { Gantt } from './Gantt';
 import * as tools from './tools';
 import * as VRender from './vrender';
 import * as VTable from './vtable';
-export declare const version = "1.17.7";
+export declare const version = "1.18.1-alpha.0";
 export { TYPES, GanttConstructorOptions, Gantt, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, tools, VRender, VTable };

package/cjs/index.js

@@ -52,5 +52,5 @@ exports.VRender = VRender;
 
 const VTable = __importStar(require("./vtable"));
 
-exports.VTable = VTable, exports.version = "1.17.7";
+exports.VTable = VTable, exports.version = "1.18.1-alpha.0";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAuBlC,sBAAK;AATP,mCAAgC;AAW9B,sFAXO,aAAK,OAWP;AAVP,+CAAiC;AAsB/B,sBAAK;AArBP,mDAAqC;AAsBnC,0BAAO;AArBT,iDAAmC;AAsBjC,wBAAM;AArBK,QAAA,OAAO,GAAG,QAAQ,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nexport const version = \"1.17.7\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools,\n  VRender,\n  VTable\n};\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAuBlC,sBAAK;AATP,mCAAgC;AAW9B,sFAXO,aAAK,OAWP;AAVP,+CAAiC;AAsB/B,sBAAK;AArBP,mDAAqC;AAsBnC,0BAAO;AArBT,iDAAmC;AAsBjC,wBAAM;AArBK,QAAA,OAAO,GAAG,gBAAgB,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nexport const version = \"1.18.1-alpha.0\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools,\n  VRender,\n  VTable\n};\n"]}

package/dist/vtable-gantt.js

@@ -627,6 +627,48 @@
     const VGlobal = Symbol.for("VGlobal");
     const DEFAULT_TEXT_FONT_FAMILY$2 = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
+    class EventListenerManager {
+      constructor() {
+        this._listenerMap = new Map(), this._eventListenerTransformer = event => event;
+      }
+      setEventListenerTransformer(transformer) {
+        this._eventListenerTransformer = transformer || (event => event);
+      }
+      addEventListener(type, listener, options) {
+        if (!listener) return;
+        const wrappedListener = event => {
+          const transformedEvent = this._eventListenerTransformer(event);
+          "function" == typeof listener ? listener(transformedEvent) : listener.handleEvent && listener.handleEvent(transformedEvent);
+        };
+        this._listenerMap.has(type) || this._listenerMap.set(type, new Map()), this._listenerMap.get(type).set(listener, wrappedListener), this._nativeAddEventListener(type, wrappedListener, options);
+      }
+      removeEventListener(type, listener, options) {
+        var _a;
+        if (!listener) return;
+        const wrappedListener = null === (_a = this._listenerMap.get(type)) || void 0 === _a ? void 0 : _a.get(listener);
+        wrappedListener && (this._nativeRemoveEventListener(type, wrappedListener, options), this._listenerMap.get(type).delete(listener), 0 === this._listenerMap.get(type).size && this._listenerMap.delete(type));
+      }
+      dispatchEvent(event) {
+        return this._nativeDispatchEvent(event);
+      }
+      clearAllEventListeners() {
+        this._listenerMap.forEach((listenersMap, type) => {
+          listenersMap.forEach((wrappedListener, originalListener) => {
+            this._nativeRemoveEventListener(type, wrappedListener, void 0);
+          });
+        }), this._listenerMap.clear();
+      }
+      _nativeAddEventListener(type, listener, options) {
+        throw new Error("_nativeAddEventListener must be implemented by derived classes");
+      }
+      _nativeRemoveEventListener(type, listener, options) {
+        throw new Error("_nativeRemoveEventListener must be implemented by derived classes");
+      }
+      _nativeDispatchEvent(event) {
+        throw new Error("_nativeDispatchEvent must be implemented by derived classes");
+      }
+    }
+
     var __decorate$17 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
@@ -667,7 +709,7 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
       };
-    let DefaultGlobal = class {
+    let DefaultGlobal = class extends EventListenerManager {
       get env() {
         return this._env;
       }
@@ -711,10 +753,19 @@
         this._env || this.setEnv("browser"), this.envContribution.applyStyles = support;
       }
       constructor(contributions) {
-        this.contributions = contributions, this._isImageAnonymous = !0, this.id = Generator.GenAutoIncrementId(), this.hooks = {
+        super(), this.contributions = contributions, this._isImageAnonymous = !0, this.eventListenerTransformer = event => event, this.id = Generator.GenAutoIncrementId(), this.hooks = {
           onSetEnv: new SyncHook(["lastEnv", "env", "global"])
         }, this.measureTextMethod = "native", this.optimizeVisible = !1;
       }
+      _nativeAddEventListener(type, listener, options) {
+        return this._env || this.setEnv("browser"), this.envContribution.addEventListener(type, listener, options);
+      }
+      _nativeRemoveEventListener(type, listener, options) {
+        return this._env || this.setEnv("browser"), this.envContribution.removeEventListener(type, listener, options);
+      }
+      _nativeDispatchEvent(event) {
+        return this._env || this.setEnv("browser"), this.envContribution.dispatchEvent(event);
+      }
       bindContribution(params) {
         const promiseArr = [];
         if (this.contributions.getContributions().forEach(contribution => {
@@ -755,15 +806,6 @@
       releaseCanvas(canvas) {
         return this._env || this.setEnv("browser"), this.envContribution.releaseCanvas(canvas);
       }
-      addEventListener(type, listener, options) {
-        return this._env || this.setEnv("browser"), this.envContribution.addEventListener(type, listener, options);
-      }
-      removeEventListener(type, listener, options) {
-        return this._env || this.setEnv("browser"), this.envContribution.removeEventListener(type, listener, options);
-      }
-      dispatchEvent(event) {
-        return this._env || this.setEnv("browser"), this.envContribution.dispatchEvent(event);
-      }
       getRequestAnimationFrame() {
         return this._env || this.setEnv("browser"), this.envContribution.getRequestAnimationFrame();
       }
@@ -5617,7 +5659,7 @@
       };
     const VWindow = Symbol.for("VWindow");
     const WindowHandlerContribution = Symbol.for("WindowHandlerContribution");
-    let DefaultWindow = class {
+    let DefaultWindow = class extends EventListenerManager {
       get width() {
         if (this._handler) {
           const wh = this._handler.getWH();
@@ -5636,7 +5678,7 @@
         return this._handler.getDpr();
       }
       constructor() {
-        this.hooks = {
+        super(), this.hooks = {
           onChange: new SyncHook(["x", "y", "width", "height"])
         }, this.active = () => {
           const global = this.global;
@@ -5644,6 +5686,15 @@
           container.getNamed(WindowHandlerContribution, global.env).configure(this, global), this.actived = !0;
         }, this._uid = Generator.GenAutoIncrementId(), this.global = application.global, this.postInit();
       }
+      _nativeAddEventListener(type, listener, options) {
+        return this._handler.addEventListener(type, listener, options);
+      }
+      _nativeRemoveEventListener(type, listener, options) {
+        return this._handler.removeEventListener(type, listener, options);
+      }
+      _nativeDispatchEvent(event) {
+        return this._handler.dispatchEvent(event);
+      }
       postInit() {
         this.global.hooks.onSetEnv.tap("window", this.active), this.active();
       }
@@ -5683,7 +5734,7 @@
         throw new Error("暂不支持");
       }
       release() {
-        return this.global.hooks.onSetEnv.unTap("window", this.active), this._handler.releaseWindow();
+        return this.global.hooks.onSetEnv.unTap("window", this.active), this.clearAllEventListeners(), this._handler.releaseWindow();
       }
       getContext() {
         return this._handler.getContext();
@@ -5694,15 +5745,6 @@
       getImageBuffer(type) {
         return this._handler.getImageBuffer ? this._handler.getImageBuffer(type) : null;
       }
-      addEventListener(type, listener, options) {
-        return this._handler.addEventListener(type, listener, options);
-      }
-      removeEventListener(type, listener, options) {
-        return this._handler.removeEventListener(type, listener, options);
-      }
-      dispatchEvent(event) {
-        return this._handler.dispatchEvent(event);
-      }
       getBoundingClientRect() {
         return this._handler.getBoundingClientRect();
       }
@@ -6911,19 +6953,17 @@
           globalObj: globalObj,
           domElement: domElement
         } = this;
-        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.getDocument().addEventListener("pointermove", this.onPointerMove, !0), globalObj.getDocument().addEventListener("pointerup", this.onPointerUp, !0)) : (domElement.addEventListener("pointermove", this.onPointerMove, !0), domElement.addEventListener("pointerup", this.onPointerUp, !0)), domElement.addEventListener("pointerdown", this.onPointerDown, !0), domElement.addEventListener("pointerleave", this.onPointerOverOut, !0), domElement.addEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.getDocument().addEventListener("mousemove", this.onPointerMove, !0), globalObj.getDocument().addEventListener("mouseup", this.onPointerUp, !0)) : (domElement.addEventListener("mousemove", this.onPointerMove, !0), domElement.addEventListener("mouseup", this.onPointerUp, !0)), domElement.addEventListener("mousedown", this.onPointerDown, !0), domElement.addEventListener("mouseout", this.onPointerOverOut, !0), domElement.addEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.addEventListener("touchstart", this.onPointerDown, !0), domElement.addEventListener("touchend", this.onPointerUp, !0), domElement.addEventListener("touchmove", this.onPointerMove, !0)), domElement.addEventListener("wheel", this.onWheel, {
+        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.addEventListener("pointermove", this.onPointerMove, !0), globalObj.addEventListener("pointerup", this.onPointerUp, !0)) : (domElement.addEventListener("pointermove", this.onPointerMove, !0), domElement.addEventListener("pointerup", this.onPointerUp, !0)), domElement.addEventListener("pointerdown", this.onPointerDown, !0), domElement.addEventListener("pointerleave", this.onPointerOverOut, !0), domElement.addEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.addEventListener("mousemove", this.onPointerMove, !0), globalObj.addEventListener("mouseup", this.onPointerUp, !0)) : (domElement.addEventListener("mousemove", this.onPointerMove, !0), domElement.addEventListener("mouseup", this.onPointerUp, !0)), domElement.addEventListener("mousedown", this.onPointerDown, !0), domElement.addEventListener("mouseout", this.onPointerOverOut, !0), domElement.addEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.addEventListener("touchstart", this.onPointerDown, !0), domElement.addEventListener("touchend", this.onPointerUp, !0), domElement.addEventListener("touchmove", this.onPointerMove, !0)), domElement.addEventListener("wheel", this.onWheel, {
           capture: !0
         }), this.eventsAdded = !0;
       }
       removeEvents() {
-        var _a;
         if (!this.eventsAdded || !this.domElement) return;
         const {
-            globalObj: globalObj,
-            domElement: domElement
-          } = this,
-          globalDocument = null !== (_a = globalObj.getDocument()) && void 0 !== _a ? _a : domElement;
-        this.supportsPointerEvents ? (globalDocument.removeEventListener("pointermove", this.onPointerMove, !0), globalDocument.removeEventListener("pointerup", this.onPointerUp, !0), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalDocument.removeEventListener("mousemove", this.onPointerMove, !0), globalDocument.removeEventListener("mouseup", this.onPointerUp, !0), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
+          globalObj: globalObj,
+          domElement: domElement
+        } = this;
+        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.removeEventListener("pointermove", this.onPointerMove, !0), globalObj.removeEventListener("pointerup", this.onPointerUp, !0)) : (domElement.removeEventListener("pointermove", this.onPointerMove, !0), domElement.removeEventListener("pointerup", this.onPointerUp, !0)), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.removeEventListener("mousemove", this.onPointerMove, !0), globalObj.removeEventListener("mouseup", this.onPointerUp, !0)) : (domElement.removeEventListener("mousemove", this.onPointerMove, !0), domElement.removeEventListener("mouseup", this.onPointerUp, !0)), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
       }
       mapToViewportPoint(event) {
         return this.domElement.pointTransform ? this.domElement.pointTransform(event.x, event.y) : event;
@@ -50127,40 +50167,7 @@
         target && !target.isDescendantsOf(table.scenegraph.tableGroup) && table.fireListeners(TABLE_EVENT_TYPE.MOUSELEAVE_TABLE, {
           event: e.nativeEvent
         });
-      });
-      const globalPointerupCallback = e => {
-          var _a;
-          const target = e.target;
-          if (!table.getElement().contains(target)) {
-            const isCompleteEdit = null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.completeEdit(e);
-            getPromiseValue(isCompleteEdit, isCompleteEdit => {
-              !1 !== isCompleteEdit && (stateManager.updateInteractionState(InteractionState.default), eventManager.dealTableHover());
-            });
-          }
-        },
-        globalPointerdownCallback = e => {
-          var _a;
-          const target = e.target;
-          if (!table.getElement().contains(target) && !table.internalProps.menuHandler.containElement(target)) {
-            const isCompleteEdit = null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.completeEdit(e);
-            getPromiseValue(isCompleteEdit, isCompleteEdit => {
-              var _a, _b;
-              if (!1 !== isCompleteEdit && (null === (_a = table.options.select) || void 0 === _a ? void 0 : _a.outsideClickDeselect)) {
-                const isHasSelected = !!(null === (_b = stateManager.select.ranges) || void 0 === _b ? void 0 : _b.length);
-                eventManager.dealTableSelect(), stateManager.endSelectCells(!0, isHasSelected);
-              }
-            });
-          }
-        };
-      eventManager.globalEventListeners.push({
-        name: "pointerup",
-        env: "document",
-        callback: globalPointerupCallback
-      }), eventManager.globalEventListeners.push({
-        name: "pointerdown",
-        env: "document",
-        callback: globalPointerdownCallback
-      }), vglobal.addEventListener("pointerup", globalPointerupCallback), vglobal.addEventListener("pointerdown", globalPointerdownCallback), table.scenegraph.tableGroup.addEventListener("pointerdown", e => {
+      }), table.scenegraph.tableGroup.addEventListener("pointerdown", e => {
         var _a, _b, _c, _d, _e;
         if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE) && table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
           event: e.nativeEvent
@@ -50852,18 +50859,32 @@
         return values;
       }
       const globalPointerdownCallback = e => {
+        var _a;
         table.eventManager.LastBodyPointerXY = {
           x: e.x,
           y: e.y
         }, table.eventManager.isDown = !0;
+        const target = e.target;
+        if (!table.getElement().contains(target) && !table.internalProps.menuHandler.containElement(target)) {
+          const isCompleteEdit = null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.completeEdit(e);
+          getPromiseValue(isCompleteEdit, isCompleteEdit => {
+            var _a, _b;
+            if (!1 !== isCompleteEdit && (null === (_a = table.options.select) || void 0 === _a ? void 0 : _a.outsideClickDeselect)) {
+              const isHasSelected = !!(null === (_b = stateManager.select.ranges) || void 0 === _b ? void 0 : _b.length);
+              eventManager.dealTableSelect(), stateManager.endSelectCells(!0, isHasSelected);
+            }
+          });
+        }
       };
       eventManager.globalEventListeners.push({
         name: "pointerdown",
-        env: "body",
+        env: "vglobal",
         callback: globalPointerdownCallback
-      }), document.body.addEventListener("pointerdown", globalPointerdownCallback);
+      }), vglobal.addEventListener("pointerdown", globalPointerdownCallback);
       const globalPointerupCallback = e => {
-        if (e.target !== table.canvas && (e => {
+        var _a;
+        const target = e.target;
+        if (target !== table.canvas && (e => {
           var _a, _b;
           if (stateManager.menu.isShow && setTimeout(() => {
             table.internalProps.menuHandler.pointInMenuElement(e.clientX, e.clientY) || stateManager.menu.isShow && stateManager.hideMenu();
@@ -50888,13 +50909,18 @@
         })(e), table.eventManager.LastBodyPointerXY = null, table.eventManager.isDown = !1, table.eventManager.isDraging = !1, table.eventManager.inertiaScroll.endInertia(), "grabing" === stateManager.interactionState && stateManager.isResizeCol()) endResizeCol(table);else if ("grabing" === stateManager.interactionState && stateManager.isResizeRow()) endResizeRow(table);else if (stateManager.isMoveCol()) {
           const endMoveColSuccess = table.stateManager.endMoveCol();
           fireMoveColEventListeners(table, endMoveColSuccess, e);
+        } else if (table.editorManager.editingEditor && !table.getElement().contains(target)) {
+          const isCompleteEdit = null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.completeEdit(e);
+          getPromiseValue(isCompleteEdit, isCompleteEdit => {
+            !1 !== isCompleteEdit && (stateManager.updateInteractionState(InteractionState.default), eventManager.dealTableHover());
+          });
         }
       };
       eventManager.globalEventListeners.push({
         name: "pointerup",
-        env: "document",
+        env: "vglobal",
         callback: globalPointerupCallback
-      }), document.addEventListener("pointerup", globalPointerupCallback);
+      }), vglobal.addEventListener("pointerup", globalPointerupCallback);
       const globalPointermoveCallback = e => {
         var _a, _b, _c, _d, _e;
         if (table.eventManager.isDown && table.eventManager.LastBodyPointerXY) {
@@ -50950,9 +50976,9 @@
       };
       eventManager.globalEventListeners.push({
         name: "pointermove",
-        env: "body",
+        env: "vglobal",
         callback: globalPointermoveCallback
-      }), document.body.addEventListener("pointermove", globalPointermoveCallback);
+      }), vglobal.addEventListener("pointermove", globalPointermoveCallback);
     }
 
     function bindTouchListener(eventManager) {
@@ -50960,17 +50986,21 @@
         stateManager = table.stateManager,
         scenegraph = table.scenegraph;
       eventManager.touchMovePoints = [], table.scenegraph.tableGroup.addEventListener("touchstart", e => {
-        e.target.isChildOf(scenegraph.component.vScrollBar) || e.target.isChildOf(scenegraph.component.vScrollBar) || (eventManager.isTouchdown = !0, eventManager.touchMovePoints.push({
-          x: e.page.x,
-          y: e.page.y,
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        if (e.target.isChildOf(scenegraph.component.vScrollBar) || e.target.isChildOf(scenegraph.component.vScrollBar)) return;
+        eventManager.isTouchdown = !0;
+        const touchEvent = e.nativeEvent;
+        eventManager.touchMovePoints.push({
+          x: null !== (_e = null !== (_c = null === (_b = null === (_a = touchEvent.changedTouches) || void 0 === _a ? void 0 : _a[0]) || void 0 === _b ? void 0 : _b._canvasX) && void 0 !== _c ? _c : null === (_d = e.canvas) || void 0 === _d ? void 0 : _d.x) && void 0 !== _e ? _e : e.page.x,
+          y: null !== (_k = null !== (_h = null === (_g = null === (_f = touchEvent.changedTouches) || void 0 === _f ? void 0 : _f[0]) || void 0 === _g ? void 0 : _g._canvasY) && void 0 !== _h ? _h : null === (_j = e.canvas) || void 0 === _j ? void 0 : _j.y) && void 0 !== _k ? _k : e.page.y,
           timestamp: Date.now()
-        }));
+        });
       });
       const globalTouchMoveCallback = e => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (eventManager.touchMove && e.preventDefault(), eventManager.isTouchdown && isTouchEvent$1(e)) if ((null === (_b = null === (_a = eventManager.downIcon) || void 0 === _a ? void 0 : _a.attribute) || void 0 === _b ? void 0 : _b.funcType) === IconFuncTypeEnum.dragReorder) e.preventDefault();else if (eventManager.touchMovePoints.length > 4 && eventManager.touchMovePoints.shift(), eventManager.touchMovePoints.push({
-          x: e.changedTouches[0].pageX,
-          y: e.changedTouches[0].pageY,
+          x: null !== (_c = e.changedTouches[0]._canvasX) && void 0 !== _c ? _c : e.changedTouches[0].pageX,
+          y: null !== (_d = e.changedTouches[0]._canvasY) && void 0 !== _d ? _d : e.changedTouches[0].pageY,
           timestamp: Date.now()
         }), eventManager._enableTableScroll) {
           const deltaX = -eventManager.touchMovePoints[eventManager.touchMovePoints.length - 1].x + eventManager.touchMovePoints[eventManager.touchMovePoints.length - 2].x,
@@ -50981,23 +51011,23 @@
           }, stateManager), e.cancelable && ("none" === table.internalProps.overscrollBehavior || Math.abs(deltaY) >= Math.abs(deltaX) && 0 !== deltaY && isVerticalScrollable(deltaY, stateManager) || Math.abs(deltaY) <= Math.abs(deltaX) && 0 !== deltaX && isHorizontalScrollable(deltaX, stateManager)) && e.preventDefault();
         }
       };
-      window.addEventListener("touchmove", globalTouchMoveCallback, {
+      vglobal.addEventListener("touchmove", globalTouchMoveCallback, {
         passive: !1
       }), eventManager.globalEventListeners.push({
         name: "touchmove",
-        env: "window",
+        env: "vglobal",
         callback: globalTouchMoveCallback
       });
       const globalTouchEndCallback = e => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         if (eventManager.touchEnd = !0, eventManager.touchMove = !1, eventManager.isTouchdown && isTouchEvent$1(e)) {
           if ((null === (_b = null === (_a = eventManager.downIcon) || void 0 === _a ? void 0 : _a.attribute) || void 0 === _b ? void 0 : _b.funcType) === IconFuncTypeEnum.dragReorder) e.preventDefault();else if ((null === (_c = eventManager.touchMovePoints) || void 0 === _c ? void 0 : _c.length) && (eventManager.touchMovePoints.length > 4 && eventManager.touchMovePoints.shift(), eventManager.touchMovePoints.push({
-            x: e.changedTouches[0].pageX,
-            y: e.changedTouches[0].pageY,
+            x: null !== (_d = e.changedTouches[0]._canvasX) && void 0 !== _d ? _d : e.changedTouches[0].pageX,
+            y: null !== (_e = e.changedTouches[0]._canvasY) && void 0 !== _e ? _e : e.changedTouches[0].pageY,
             timestamp: Date.now()
           }), eventManager._enableTableScroll)) {
             const firstPoint = eventManager.touchMovePoints[0],
-              lastPoint = eventManager.touchMovePoints[(null === (_d = eventManager.touchMovePoints) || void 0 === _d ? void 0 : _d.length) - 1],
+              lastPoint = eventManager.touchMovePoints[(null === (_f = eventManager.touchMovePoints) || void 0 === _f ? void 0 : _f.length) - 1],
               vX = (lastPoint.x - firstPoint.x) / (lastPoint.timestamp - firstPoint.timestamp),
               vY = (lastPoint.y - firstPoint.y) / (lastPoint.timestamp - firstPoint.timestamp);
             eventManager.inertiaScroll.startInertia(vX, vY, .95), table.eventManager.inertiaScroll.setScrollHandle((dx, dy) => {
@@ -51010,17 +51040,17 @@
           eventManager.isTouchdown = !1, eventManager.touchMovePoints = [];
         }
       };
-      window.addEventListener("touchend", globalTouchEndCallback), eventManager.globalEventListeners.push({
+      vglobal.addEventListener("touchend", globalTouchEndCallback), eventManager.globalEventListeners.push({
         name: "touchend",
-        env: "window",
+        env: "vglobal",
         callback: globalTouchEndCallback
       });
       const globalTouchCancelCallback = e => {
         eventManager.touchEnd = !0, eventManager.touchMove = !1, eventManager.isTouchdown && (eventManager.isTouchdown = !1, eventManager.touchMovePoints = []);
       };
-      window.addEventListener("touchcancel", globalTouchCancelCallback), eventManager.globalEventListeners.push({
+      vglobal.addEventListener("touchcancel", globalTouchCancelCallback), eventManager.globalEventListeners.push({
         name: "touchcancel",
-        env: "window",
+        env: "vglobal",
         callback: globalTouchCancelCallback
       });
     }
@@ -51512,7 +51542,7 @@
       }
       release() {
         this.gesture.release(), this.globalEventListeners.forEach(item => {
-          "document" === item.env ? document.removeEventListener(item.name, item.callback) : "body" === item.env ? document.body.removeEventListener(item.name, item.callback) : "window" === item.env && window.removeEventListener(item.name, item.callback);
+          "document" === item.env ? document.removeEventListener(item.name, item.callback) : "body" === item.env ? document.body.removeEventListener(item.name, item.callback) : "window" === item.env ? window.removeEventListener(item.name, item.callback) : "vglobal" === item.env && vglobal.removeEventListener(item.name, item.callback);
         }), this.globalEventListeners = [];
       }
       enableScroll() {
@@ -54146,7 +54176,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.17.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.18.1-alpha.0", 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
@@ -67291,7 +67321,7 @@
         themes: themes$1
     });
 
-    const version = "1.17.7";
+    const version = "1.18.1-alpha.0";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$3;