@visactor/vtable 1.6.2 → 1.6.3-alpha.0

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAA8F;AAC9F,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IAGf,IAAA,+BAAU,GAAE,CAAC;AACf,CAAC;AAjCD,gDAiCC;AAGD,uDAAqD;AAA5C,2GAAA,WAAW,OAAA;AACpB,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AAErB,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.6.2\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  // registerWrapText();\n\n  loadPoptip();\n}\n\nexport type { Direction, Timeline } from '@visactor/vrender-core';\nexport { GroupFadeIn } from '@visactor/vrender-core';\nexport { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAA8F;AAC9F,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IAGf,IAAA,+BAAU,GAAE,CAAC;AACf,CAAC;AAjCD,gDAiCC;AAGD,uDAAqD;AAA5C,2GAAA,WAAW,OAAA;AACpB,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AAErB,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.6.3-alpha.0\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  // registerWrapText();\n\n  loadPoptip();\n}\n\nexport type { Direction, Timeline } from '@visactor/vrender-core';\nexport { GroupFadeIn } from '@visactor/vrender-core';\nexport { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\n"]}

package/dist/vtable.js

@@ -48023,7 +48023,7 @@
         checkCellRangeInSelect(cellPosStart, cellPosEnd) {
             return checkMultiCellInSelect(cellPosStart, cellPosEnd, this.select.ranges, this.select.highlightScope);
         }
-        updateHoverIcon(col, row, target, cellGroup, event) {
+        updateHoverIcon(col, row, target, cellGroup) {
             if (this.residentHoverIcon?.icon && target === this.residentHoverIcon?.icon) {
                 return;
             }
@@ -48294,6 +48294,7 @@
             this.table.scenegraph.proxy.deltaY = 0;
             this.updateHoverPos(-1, -1);
             this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+                event: undefined,
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: this.scroll.horizontalBarPos,
                 scrollHeight: this.table.theme.scrollStyle?.width,
@@ -48319,6 +48320,7 @@
             this.table.scenegraph.proxy.deltaX = 0;
             this.updateHoverPos(-1, -1);
             this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+                event: undefined,
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: this.scroll.horizontalBarPos,
                 scrollHeight: this.table.theme.scrollStyle?.width,
@@ -48332,7 +48334,7 @@
                 this.checkHorizontalScrollBarEnd();
             }
         }
-        setScrollTop(top) {
+        setScrollTop(top, event) {
             const totalHeight = this.table.getAllRowsHeight();
             const sizeTolerance = this.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
             top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height - sizeTolerance));
@@ -48350,6 +48352,7 @@
             this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio);
             if (oldVerticalBarPos !== top) {
                 this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+                    event: event?.nativeEvent,
                     scrollTop: this.scroll.verticalBarPos,
                     scrollLeft: this.scroll.horizontalBarPos,
                     scrollHeight: this.table.theme.scrollStyle?.width,
@@ -48362,7 +48365,7 @@
                 this.checkVerticalScrollBarEnd();
             }
         }
-        setScrollLeft(left) {
+        setScrollLeft(left, event) {
             this.table.scrollLeft;
             const totalWidth = this.table.getAllColsWidth();
             this.table.getFrozenColsWidth();
@@ -48382,6 +48385,7 @@
             this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
             if (oldHorizontalBarPos !== left) {
                 this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+                    event: event?.nativeEvent,
                     scrollTop: this.scroll.verticalBarPos,
                     scrollLeft: this.scroll.horizontalBarPos,
                     scrollHeight: this.table.theme.scrollStyle?.width,
@@ -48854,6 +48858,132 @@
         });
     }
 
+    function handleWhell(event, state, isWheelEvent = true) {
+        let { deltaX, deltaY } = event;
+        if (event.shiftKey && event.deltaY) {
+            deltaX = deltaY;
+            deltaY = 0;
+        }
+        const [optimizedDeltaX, optimizedDeltaY] = optimizeScrollXY(deltaX, deltaY, { horizontal: 1, vertical: 1 });
+        if (optimizedDeltaX || optimizedDeltaY) {
+            if (state.interactionState !== InteractionState.scrolling) {
+                state.updateInteractionState(InteractionState.scrolling);
+            }
+        }
+        if (optimizedDeltaX) {
+            state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX, event);
+            state.showHorizontalScrollBar(true);
+        }
+        if (optimizedDeltaY) {
+            state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event);
+            state.showVerticalScrollBar(true);
+        }
+        isWheelEvent && state.resetInteractionState();
+        if (event.cancelable &&
+            (state.table.internalProps.overscrollBehavior === 'none' ||
+                (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||
+                (Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))) {
+            event.preventDefault();
+        }
+    }
+    function optimizeScrollXY(x, y, ratio) {
+        const ANGLE = 2;
+        const angle = Math.abs(x / y);
+        const deltaX = angle <= 1 / ANGLE ? 0 : x;
+        const deltaY = angle > ANGLE ? 0 : y;
+        return [Math.ceil(deltaX * (ratio.horizontal ?? 0)), Math.ceil(deltaY * (ratio.vertical ?? 0))];
+    }
+    function isVerticalScrollable(deltaY, state) {
+        const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
+        if (totalHeight === 0) {
+            return false;
+        }
+        return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);
+    }
+    function isHorizontalScrollable(deltaX, state) {
+        const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
+        if (totalWidth === 0) {
+            return false;
+        }
+        return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);
+    }
+    function isScrollToTop(deltaY, state) {
+        const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
+        return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;
+    }
+    function isScrollToBottom(deltaY, state) {
+        const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
+        const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
+        return totalHeight !== 0 && deltaY >= 0 && Math.abs(state.scroll.verticalBarPos - totalHeight) < 1 + sizeTolerance;
+    }
+    function isScrollToLeft(deltaX, state) {
+        const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
+        return totalWidth !== 0 && deltaX <= 0 && state.scroll.horizontalBarPos < 1;
+    }
+    function isScrollToRight(deltaX, state) {
+        const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
+        const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
+        return totalWidth !== 0 && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1 + sizeTolerance;
+    }
+    class InertiaScroll {
+        friction;
+        lastTime;
+        speedX;
+        speedY;
+        stateManager;
+        runingId;
+        scrollHandle;
+        constructor(stateManager) {
+            this.stateManager = stateManager;
+        }
+        setScrollHandle(scrollHandle) {
+            this.scrollHandle = scrollHandle;
+        }
+        startInertia(speedX, speedY, friction) {
+            this.lastTime = Date.now();
+            this.speedX = speedX;
+            this.speedY = speedY;
+            this.friction = friction;
+            if (!this.runingId) {
+                this.runingId = requestAnimationFrame(this.inertia.bind(this));
+            }
+        }
+        inertia() {
+            const now = Date.now();
+            const dffTime = now - this.lastTime;
+            let stopped = true;
+            const f = Math.pow(this.friction, dffTime / 16);
+            const newSpeedX = f * this.speedX;
+            const newSpeedY = f * this.speedY;
+            let dx = 0;
+            let dy = 0;
+            if (Math.abs(newSpeedX) > 0.05) {
+                stopped = false;
+                dx = ((this.speedX + newSpeedX) / 2) * dffTime;
+            }
+            if (Math.abs(newSpeedY) > 0.05) {
+                stopped = false;
+                dy = ((this.speedY + newSpeedY) / 2) * dffTime;
+            }
+            this.scrollHandle?.(dx, dy);
+            if (stopped) {
+                this.runingId = null;
+                return;
+            }
+            this.lastTime = now;
+            this.speedX = newSpeedX;
+            this.speedY = newSpeedY;
+            this.runingId = requestAnimationFrame(this.inertia.bind(this));
+        }
+        endInertia() {
+            cancelAnimationFrame(this.runingId);
+            this.runingId = null;
+        }
+        isInertiaScrolling() {
+            return !!this.runingId;
+        }
+    }
+
     function bindTableGroupListener(eventManager) {
         const table = eventManager.table;
         const stateManager = table.stateManager;
@@ -49553,6 +49683,12 @@
             table.fireListeners(TABLE_EVENT_TYPE.RADIO_STATE_CHANGE, cellsEvent);
             table.scenegraph.updateNextFrame();
         });
+        table.scenegraph.stage.addEventListener('wheel', (e) => {
+            table.editorManager?.completeEdit();
+            if (table.eventManager._enableTableScroll) {
+                handleWhell(e, stateManager);
+            }
+        });
     }
     function bindGesture(eventManager) {
         const table = eventManager.table;
@@ -49757,132 +49893,6 @@
         });
     }
 
-    function handleWhell(event, state, isWheelEvent = true) {
-        let { deltaX, deltaY } = event;
-        if (event.shiftKey && event.deltaY) {
-            deltaX = deltaY;
-            deltaY = 0;
-        }
-        const [optimizedDeltaX, optimizedDeltaY] = optimizeScrollXY(deltaX, deltaY, { horizontal: 1, vertical: 1 });
-        if (optimizedDeltaX || optimizedDeltaY) {
-            if (state.interactionState !== InteractionState.scrolling) {
-                state.updateInteractionState(InteractionState.scrolling);
-            }
-        }
-        if (optimizedDeltaX) {
-            state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX);
-            state.showHorizontalScrollBar(true);
-        }
-        if (optimizedDeltaY) {
-            state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY);
-            state.showVerticalScrollBar(true);
-        }
-        isWheelEvent && state.resetInteractionState();
-        if (event.cancelable &&
-            (state.table.internalProps.overscrollBehavior === 'none' ||
-                (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||
-                (Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))) {
-            event.preventDefault();
-        }
-    }
-    function optimizeScrollXY(x, y, ratio) {
-        const ANGLE = 2;
-        const angle = Math.abs(x / y);
-        const deltaX = angle <= 1 / ANGLE ? 0 : x;
-        const deltaY = angle > ANGLE ? 0 : y;
-        return [Math.ceil(deltaX * (ratio.horizontal ?? 0)), Math.ceil(deltaY * (ratio.vertical ?? 0))];
-    }
-    function isVerticalScrollable(deltaY, state) {
-        const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
-        if (totalHeight === 0) {
-            return false;
-        }
-        return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);
-    }
-    function isHorizontalScrollable(deltaX, state) {
-        const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
-        if (totalWidth === 0) {
-            return false;
-        }
-        return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);
-    }
-    function isScrollToTop(deltaY, state) {
-        const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
-        return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;
-    }
-    function isScrollToBottom(deltaY, state) {
-        const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
-        const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
-        return totalHeight !== 0 && deltaY >= 0 && Math.abs(state.scroll.verticalBarPos - totalHeight) < 1 + sizeTolerance;
-    }
-    function isScrollToLeft(deltaX, state) {
-        const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
-        return totalWidth !== 0 && deltaX <= 0 && state.scroll.horizontalBarPos < 1;
-    }
-    function isScrollToRight(deltaX, state) {
-        const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
-        const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
-        return totalWidth !== 0 && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1 + sizeTolerance;
-    }
-    class InertiaScroll {
-        friction;
-        lastTime;
-        speedX;
-        speedY;
-        stateManager;
-        runingId;
-        scrollHandle;
-        constructor(stateManager) {
-            this.stateManager = stateManager;
-        }
-        setScrollHandle(scrollHandle) {
-            this.scrollHandle = scrollHandle;
-        }
-        startInertia(speedX, speedY, friction) {
-            this.lastTime = Date.now();
-            this.speedX = speedX;
-            this.speedY = speedY;
-            this.friction = friction;
-            if (!this.runingId) {
-                this.runingId = requestAnimationFrame(this.inertia.bind(this));
-            }
-        }
-        inertia() {
-            const now = Date.now();
-            const dffTime = now - this.lastTime;
-            let stopped = true;
-            const f = Math.pow(this.friction, dffTime / 16);
-            const newSpeedX = f * this.speedX;
-            const newSpeedY = f * this.speedY;
-            let dx = 0;
-            let dy = 0;
-            if (Math.abs(newSpeedX) > 0.05) {
-                stopped = false;
-                dx = ((this.speedX + newSpeedX) / 2) * dffTime;
-            }
-            if (Math.abs(newSpeedY) > 0.05) {
-                stopped = false;
-                dy = ((this.speedY + newSpeedY) / 2) * dffTime;
-            }
-            this.scrollHandle?.(dx, dy);
-            if (stopped) {
-                this.runingId = null;
-                return;
-            }
-            this.lastTime = now;
-            this.speedX = newSpeedX;
-            this.speedY = newSpeedY;
-            this.runingId = requestAnimationFrame(this.inertia.bind(this));
-        }
-        endInertia() {
-            cancelAnimationFrame(this.runingId);
-            this.runingId = null;
-        }
-        isInertiaScrolling() {
-            return !!this.runingId;
-        }
-    }
-
     let defaultPixelRatio = 1;
     function getPixelRatio() {
         if (isNode) {
@@ -49905,12 +49915,6 @@
         handler.on(table.getElement(), 'blur', (e) => {
             eventManager.dealTableHover();
         });
-        handler.on(table.getElement(), 'wheel', (e) => {
-            table.editorManager?.completeEdit();
-            if (table.eventManager._enableTableScroll) {
-                handleWhell(e, stateManager);
-            }
-        });
         handler.on(table.getElement(), 'keydown', (e) => {
             if (e.key === 'a' && (e.ctrlKey || e.metaKey)) {
                 if (table.keyboardOptions?.selectAllOnCtrlA) {
@@ -50906,7 +50910,7 @@
         dealIconHover(eventArgsSet) {
             const { eventArgs } = eventArgsSet;
             if (eventArgs) {
-                this.table.stateManager.updateHoverIcon(eventArgs.col, eventArgs.row, eventArgs.target, eventArgs.targetCell, eventArgs.event);
+                this.table.stateManager.updateHoverIcon(eventArgs.col, eventArgs.row, eventArgs.target, eventArgs.targetCell);
             }
             else {
                 this.table.stateManager.updateHoverIcon(-1, -1, undefined, undefined);
@@ -55156,7 +55160,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.6.2";
+        version = "1.6.3-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -75651,7 +75655,7 @@
     }
 
     registerForVrender();
-    const version = "1.6.2";
+    const version = "1.6.3-alpha.0";
     function getIcons() {
         return get$2();
     }