@visactor/vtable 1.18.2-alpha.2 → 1.18.2

package/dist/vtable.js

@@ -55507,7 +55507,7 @@
                         eventManager.touchEnd = false;
                         eventManager.touchSetTimeout = setTimeout(() => {
                             eventManager.isTouchdown = false;
-                            eventManager.touchMove = true;
+                            eventManager.isLongTouch = true;
                             if (!eventManager.touchEnd &&
                                 (eventManager.checkColumnResize(eventArgsSet, true) || eventManager.checkRowResize(eventArgsSet, true))) {
                                 stateManager.updateInteractionState(InteractionState.grabing);
@@ -55638,6 +55638,12 @@
                     });
                 }
             }
+            setTimeout(() => {
+                eventManager.isTouchdown = false;
+                eventManager.isTouchMove = false;
+                eventManager.isDraging = false;
+                eventManager.touchMovePoints = [];
+            }, 0);
         });
         table.scenegraph.tableGroup.addEventListener('rightdown', (e) => {
             const eventArgsSet = getCellEventArgsSet(e);
@@ -55684,7 +55690,7 @@
                 return;
             }
             const eventArgsSet = getCellEventArgsSet(e);
-            if (!eventManager.touchMove &&
+            if (!eventManager.isTouchMove &&
                 e.button === 0 &&
                 eventArgsSet.eventArgs &&
                 table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
@@ -56672,6 +56678,9 @@
             return values;
         }
         const globalPointerdownCallback = (e) => {
+            if (table.isReleased) {
+                return;
+            }
             table.eventManager.LastBodyPointerXY = { x: e.x, y: e.y };
             table.eventManager.isDown = true;
             const target = e.target;
@@ -56734,6 +56743,9 @@
             }
         };
         const globalPointerupCallback = (e) => {
+            if (table.isReleased) {
+                return;
+            }
             const target = e.target;
             if (target !== table.canvas) {
                 globalPointerupOutsideCallback(e);
@@ -56779,7 +56791,7 @@
                     table.eventManager.isDraging = true;
                 }
             }
-            const { x, y } = table._getMouseAbstractPoint(e, false);
+            const { x, y } = table._getMouseAbstractPoint(e);
             if (stateManager.interactionState === InteractionState.grabing) {
                 if (stateManager.isResizeCol()) {
                     eventManager.dealColumnResize(x, y);
@@ -56922,18 +56934,19 @@
             eventManager.isTouchdown = true;
             const touchEvent = e.nativeEvent;
             eventManager.touchMovePoints.push({
-                x: touchEvent.changedTouches?.[0]?._canvasX ?? e.canvas?.x ?? e.page.x,
-                y: touchEvent.changedTouches?.[0]?._canvasY ?? e.canvas?.y ?? e.page.y,
+                x: table.rotateDegree ? touchEvent.changedTouches?.[0]?._canvasX ?? e.canvas?.x : e.page.x,
+                y: table.rotateDegree ? touchEvent.changedTouches?.[0]?._canvasY ?? e.canvas?.y : e.page.y,
                 timestamp: Date.now()
             });
         });
         const globalTouchMoveCallback = (e) => {
-            if (eventManager.touchMove) {
+            if (eventManager.isLongTouch) {
                 e.preventDefault();
             }
             if (!eventManager.isTouchdown || !isTouchEvent$1(e)) {
                 return;
             }
+            eventManager.isTouchMove = true;
             if (eventManager.downIcon?.attribute?.funcType === IconFuncTypeEnum.dragReorder) {
                 e.preventDefault();
             }
@@ -56942,8 +56955,8 @@
                     eventManager.touchMovePoints.shift();
                 }
                 eventManager.touchMovePoints.push({
-                    x: e.changedTouches[0]._canvasX ?? e.changedTouches[0].pageX,
-                    y: e.changedTouches[0]._canvasY ?? e.changedTouches[0].pageY,
+                    x: table.rotateDegree ? e.changedTouches[0]._canvasX : e.changedTouches[0].pageX,
+                    y: table.rotateDegree ? e.changedTouches[0]._canvasY : e.changedTouches[0].pageY,
                     timestamp: Date.now()
                 });
                 if (eventManager._enableTableScroll) {
@@ -56969,7 +56982,7 @@
         });
         const globalTouchEndCallback = (e) => {
             eventManager.touchEnd = true;
-            eventManager.touchMove = false;
+            eventManager.isLongTouch = false;
             if (!eventManager.isTouchdown || !isTouchEvent$1(e)) {
                 return;
             }
@@ -56982,8 +56995,8 @@
                         eventManager.touchMovePoints.shift();
                     }
                     eventManager.touchMovePoints.push({
-                        x: e.changedTouches[0]._canvasX ?? e.changedTouches[0].pageX,
-                        y: e.changedTouches[0]._canvasY ?? e.changedTouches[0].pageY,
+                        x: table.rotateDegree ? e.changedTouches[0]._canvasX : e.changedTouches[0].pageX,
+                        y: table.rotateDegree ? e.changedTouches[0]._canvasY : e.changedTouches[0].pageY,
                         timestamp: Date.now()
                     });
                     if (eventManager._enableTableScroll) {
@@ -56999,6 +57012,8 @@
                 }
             }
             eventManager.isTouchdown = false;
+            eventManager.isTouchMove = false;
+            eventManager.isDraging = false;
             eventManager.touchMovePoints = [];
         };
         vglobal.addEventListener('touchend', globalTouchEndCallback);
@@ -57009,12 +57024,14 @@
         });
         const globalTouchCancelCallback = (e) => {
             eventManager.touchEnd = true;
-            eventManager.touchMove = false;
+            eventManager.isLongTouch = false;
             if (!eventManager.isTouchdown) {
                 return;
             }
             eventManager.isTouchdown = false;
+            eventManager.isTouchMove = false;
             eventManager.touchMovePoints = [];
+            eventManager.isDraging = false;
         };
         vglobal.addEventListener('touchcancel', globalTouchCancelCallback);
         eventManager.globalEventListeners.push({
@@ -57439,10 +57456,11 @@
     class EventManager {
         table;
         isTouchdown;
+        isTouchMove;
         touchMovePoints;
         touchSetTimeout;
         touchEnd;
-        touchMove;
+        isLongTouch;
         gesture;
         handleTextStickBindId;
         LastPointerXY;
@@ -62362,8 +62380,8 @@
             this.table = table;
             options.plugins?.map(plugin => {
                 this.register(plugin);
+                this._bindTableEventForPlugin(plugin);
             });
-            this.initPlugins(table);
         }
         register(plugin) {
             this.plugins.set(plugin.id, plugin);
@@ -62374,21 +62392,32 @@
         getPlugin(id) {
             return this.plugins.get(id);
         }
-        initPlugins(table) {
-            this.plugins.forEach(plugin => {
-                plugin.runTime?.forEach(runTime => {
-                    table.on(runTime, (...args) => {
-                        plugin.run?.(...args, runTime, table);
-                    });
+        getPluginByName(name) {
+            return Array.from(this.plugins.values()).find(plugin => plugin.name === name);
+        }
+        _bindTableEventForPlugin(plugin) {
+            plugin.runTime?.forEach(runTime => {
+                this.table.on(runTime, (...args) => {
+                    plugin.run?.(...args, runTime, this.table);
                 });
             });
         }
-        updatePlugins() {
+        updatePlugins(plugins) {
+            const removedPlugins = Array.from(this.plugins.values()).filter(plugin => !plugins?.some(p => p.id === plugin.id));
+            removedPlugins.forEach(plugin => {
+                this.release();
+                this.plugins.delete(plugin.id);
+            });
             this.plugins.forEach(plugin => {
                 if (plugin.update) {
-                    plugin.update(this.table);
+                    plugin.update();
                 }
             });
+            const addedPlugins = plugins?.filter(plugin => !this.plugins.has(plugin.id));
+            addedPlugins?.forEach(plugin => {
+                this.register(plugin);
+                this._bindTableEventForPlugin(plugin);
+            });
         }
         release() {
             this.plugins.forEach(plugin => {
@@ -62431,7 +62460,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.18.2-alpha.2";
+        version = "1.18.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -62446,6 +62475,7 @@
         reactCustomLayout;
         _hasAutoImageColumn;
         pluginManager;
+        rotateDegree;
         constructor(container, options = {}) {
             super();
             if (Env.mode === 'node') {
@@ -63859,6 +63889,7 @@
             return super.fireListeners(type, event);
         }
         updateOption(options) {
+            this.editorManager?.cancelEdit();
             this.options = options;
             this._hasAutoImageColumn = undefined;
             const { frozenColCount = 0, unfreezeAllOnExceedsMaxWidth, defaultRowHeight = 40, defaultHeaderRowHeight, defaultColWidth = 80, defaultHeaderColWidth = 80, keyboardOptions, eventOptions, rowSeriesNumber, columnResizeMode, rowResizeMode = 'none', resize, dragHeaderMode, dragOrder, showFrozenIcon, allowFrozenColCount, padding, hover, menu, select: click, pixelRatio, widthMode, heightMode, autoFillWidth, autoFillHeight, widthAdaptiveMode, heightAdaptiveMode, customRender, renderChartAsync, renderChartAsyncBatchCount, canvasWidth, canvasHeight, overscrollBehavior, limitMinWidth, limitMinHeight } = options;
@@ -64054,7 +64085,7 @@
             const height = Math.min(this.tableNoFrameHeight, this.getAllRowsHeight());
             return new Rect$1(this.tableX, this.tableY, width, height);
         }
-        _getMouseAbstractPoint(evt, isAddScroll = true) {
+        _getMouseAbstractPoint(evt) {
             const table = this;
             let e;
             if (!evt) {
@@ -64077,17 +64108,27 @@
                 inTable = false;
             }
             const currentWidth = rect.width;
-            const originWidth = this.canvas.offsetWidth || currentWidth;
+            const originWidth = (this.rotateDegree === 90 ? this.canvas.offsetHeight : this.canvas.offsetWidth) || currentWidth;
             const widthRatio = currentWidth / originWidth;
             const currentHeight = rect.height;
-            const originHeight = this.canvas.offsetHeight || currentHeight;
+            const originHeight = (this.rotateDegree === 90 ? this.canvas.offsetWidth : this.canvas.offsetHeight) || currentHeight;
             const heightRatio = currentHeight / originHeight;
-            const x = (clientX - rect.left) / widthRatio + (isAddScroll ? table.scrollLeft : 0) - (this.options.viewBox?.x1 ?? 0);
-            const y = (clientY - rect.top) / heightRatio + (isAddScroll ? table.scrollTop : 0) - (this.options.viewBox?.y1 ?? 0);
+            const rotateTablePlugin = this.pluginManager.getPluginByName('Rotate Table');
+            if (rotateTablePlugin && this.rotateDegree === 90) {
+                const x = clientX / widthRatio - (this.options.viewBox?.x1 ?? 0);
+                const y = clientY / heightRatio - (this.options.viewBox?.y1 ?? 0);
+                const point = { x, y, inTable };
+                const matrix = rotateTablePlugin.matrix;
+                matrix.transformPoint(point, point);
+                return point;
+            }
+            const x = (clientX - rect.left) / widthRatio - (this.options.viewBox?.x1 ?? 0);
+            const y = (clientY - rect.top) / heightRatio - (this.options.viewBox?.y1 ?? 0);
             const point = { x, y, inTable };
             if (this.internalProps.modifiedViewBoxTransform && this.scenegraph.stage.window.getViewBoxTransform()) {
                 const transform = this.scenegraph.stage.window.getViewBoxTransform();
                 transform.transformPoint(point, point);
+                return point;
             }
             return point;
         }
@@ -69774,9 +69815,7 @@
             }
             return ifCan;
         }
-        updateOption(options, updateConfig = {
-            keepData: false
-        }) {
+        updateOption(options) {
             const internalProps = this.internalProps;
             super.updateOption(options);
             internalProps.frozenColDragHeaderMode =
@@ -69800,7 +69839,7 @@
             if (internalProps.releaseList) {
                 for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
                     const releaseObj = internalProps.releaseList[i];
-                    if (updateConfig.keepData && releaseObj instanceof DataSource) {
+                    if (releaseObj instanceof DataSource) {
                         releaseObj.updateColumns(this.internalProps.columns);
                     }
                     else {
@@ -69838,6 +69877,7 @@
                     this.internalProps.emptyTip?.resetVisible();
                 }
             }
+            this.pluginManager.updatePlugins(options.plugins);
             return new Promise(resolve => {
                 setTimeout(resolve, 0);
             });
@@ -69879,7 +69919,10 @@
             }
             const dataCount = table.internalProps.dataSource?.length ?? 0;
             layoutMap.recordsCount =
-                dataCount + (dataCount > 0 ? layoutMap.hasAggregationOnTopCount + layoutMap.hasAggregationOnBottomCount : 0);
+                dataCount +
+                    (dataCount > 0 || !!this.options.showAggregationWhenEmpty
+                        ? layoutMap.hasAggregationOnTopCount + layoutMap.hasAggregationOnBottomCount
+                        : 0);
             if (table.transpose) {
                 table.rowCount = layoutMap.rowCount ?? 0;
                 table.colCount = layoutMap.colCount ?? 0;
@@ -73458,7 +73501,7 @@
             });
             table.on(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, e => {
                 if (table.internalProps.menu?.renderMode === 'html') {
-                    const abstractPos = table._getMouseAbstractPoint(e.event, false);
+                    const abstractPos = table._getMouseAbstractPoint(e.event);
                     let menu = null;
                     if (abstractPos.inTable && typeof table.internalProps.menu?.contextMenuItems === 'function') {
                         menu = table.internalProps.menu.contextMenuItems(table.getHeaderField(e.col, e.row), e.row, e.col, table);
@@ -74184,7 +74227,7 @@
                     const position = this._attachInfo.tooltipOptions.referencePosition;
                     const { event } = e;
                     const { left, right, top, bottom } = position.rect;
-                    const abstractPos = table._getMouseAbstractPoint(event, false);
+                    const abstractPos = table._getMouseAbstractPoint(event);
                     if (!(abstractPos.inTable &&
                         abstractPos.x >= left - 5 &&
                         abstractPos.x <= right + 5 &&
@@ -85312,7 +85355,7 @@
     }
 
     registerForVrender();
-    const version = "1.18.2-alpha.2";
+    const version = "1.18.2";
     function getIcons() {
         return get$2();
     }