@visactor/vtable 1.18.1 → 1.18.2-alpha.2

package/dist/vtable.js

@@ -492,11 +492,14 @@
     const ContributionProvider = Symbol("ContributionProvider");
     class ContributionProviderCache {
       constructor(serviceIdentifier, container) {
-        this.serviceIdentifier = serviceIdentifier, this.container = container;
+        this.serviceIdentifier = serviceIdentifier, this.container = container, ContributionStore.setStore(this.serviceIdentifier, this);
       }
       getContributions() {
         return this.caches || (this.caches = [], this.container && this.container.isBound(this.serviceIdentifier) && this.caches.push(...this.container.getAll(this.serviceIdentifier))), this.caches;
       }
+      refresh() {
+        this.caches && (this.caches.length = 0, this.container && this.container.isBound(this.serviceIdentifier) && this.caches.push(...this.container.getAll(this.serviceIdentifier)));
+      }
     }
     function bindContributionProvider(bind, id) {
       bind(ContributionProvider).toDynamicValue(_ref => {
@@ -514,6 +517,20 @@
         return new ContributionProviderCache(id, container);
       }).whenTargetNamed(id);
     }
+    class ContributionStore {
+      static getStore(id) {
+        return this.store.get(id);
+      }
+      static setStore(id, cache) {
+        this.store.set(id, cache);
+      }
+      static refreshAllContributions() {
+        this.store.forEach(cache => {
+          cache.refresh();
+        });
+      }
+    }
+    ContributionStore.store = new Map();
 
     class Hook {
       constructor(args, name) {
@@ -580,6 +597,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$10 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
@@ -620,7 +679,7 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
       };
-    let DefaultGlobal = class {
+    let DefaultGlobal = class extends EventListenerManager {
       get env() {
         return this._env;
       }
@@ -664,10 +723,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 => {
@@ -708,15 +776,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();
       }
@@ -5587,7 +5646,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();
@@ -5606,7 +5665,7 @@
         return this._handler.getDpr();
       }
       constructor() {
-        this.hooks = {
+        super(), this.hooks = {
           onChange: new SyncHook(["x", "y", "width", "height"])
         }, this.active = () => {
           const global = this.global;
@@ -5614,6 +5673,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();
       }
@@ -5653,7 +5721,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();
@@ -5664,15 +5732,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();
       }
@@ -6881,19 +6940,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;
@@ -13807,6 +13864,9 @@
       init(contributions) {
         contributions && (this._renderContribitions = contributions.getContributions()), this._renderContribitions || (this._renderContribitions = []), this.builtinContributions || (this.builtinContributions = []), this.builtinContributions.push(defaultBaseClipRenderBeforeContribution), this.builtinContributions.push(defaultBaseClipRenderAfterContribution), this.builtinContributions.forEach(item => this._renderContribitions.push(item)), this._renderContribitions.length && (this._renderContribitions.sort((a, b) => b.order - a.order), this._beforeRenderContribitions = this._renderContribitions.filter(c => c.time === BaseRenderContributionTime.beforeFillStroke), this._afterRenderContribitions = this._renderContribitions.filter(c => c.time === BaseRenderContributionTime.afterFillStroke));
       }
+      reInit() {
+        this.init(this.graphicRenderContributions);
+      }
       beforeRenderStep(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, params) {
         this._beforeRenderContribitions && this._beforeRenderContribitions.forEach(c => {
           if (c.supportedAppName && graphic.stage && graphic.stage.params && graphic.stage.params.context && graphic.stage.params.context.appName) {
@@ -13976,8 +14036,8 @@
         };
       };
     let DefaultCanvasArcRender = class extends BaseRender {
-      constructor(arcRenderContribitions) {
-        super(), this.arcRenderContribitions = arcRenderContribitions, this.numberType = ARC_NUMBER_TYPE, this.builtinContributions = [defaultArcRenderContribution, defaultArcBackgroundRenderContribution, defaultArcTextureRenderContribution], this.init(arcRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = ARC_NUMBER_TYPE, this.builtinContributions = [defaultArcRenderContribution, defaultArcBackgroundRenderContribution, defaultArcTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawArcTailCapPath(arc, context, cx, cy, outerRadius, innerRadius, _sa, _ea) {
         const capAngle = _ea - _sa,
@@ -14152,8 +14212,8 @@
         };
       };
     let DefaultCanvasCircleRender = class extends BaseRender {
-      constructor(circleRenderContribitions) {
-        super(), this.circleRenderContribitions = circleRenderContribitions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(circleRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(circle, context, x, y, drawContext, params, fillCb, strokeCb) {
         const circleAttribute = getTheme(circle, null == params ? void 0 : params.theme).circle,
@@ -14539,8 +14599,8 @@
         };
       };
     let DefaultCanvasAreaRender = class extends BaseRender {
-      constructor(areaRenderContribitions) {
-        super(), this.areaRenderContribitions = areaRenderContribitions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(areaRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(graphicRenderContributions);
       }
       drawLinearAreaHighPerformance(area, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, areaAttribute, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -14783,8 +14843,8 @@
         };
       };
     let DefaultCanvasPathRender = class extends BaseRender {
-      constructor(pathRenderContribitions) {
-        super(), this.pathRenderContribitions = pathRenderContribitions, this.numberType = PATH_NUMBER_TYPE, this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution], this.init(pathRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = PATH_NUMBER_TYPE, this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(path, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -14839,8 +14899,8 @@
         };
       };
     let DefaultCanvasRectRender = class extends BaseRender {
-      constructor(rectRenderContribitions) {
-        super(), this.rectRenderContribitions = rectRenderContribitions, this.type = "rect", this.numberType = RECT_NUMBER_TYPE, this.builtinContributions = [defaultRectRenderContribution, defaultRectBackgroundRenderContribution, defaultRectTextureRenderContribution], this.init(rectRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.type = "rect", this.numberType = RECT_NUMBER_TYPE, this.builtinContributions = [defaultRectRenderContribution, defaultRectBackgroundRenderContribution, defaultRectTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -14911,8 +14971,8 @@
         };
       };
     let DefaultCanvasSymbolRender = class extends BaseRender {
-      constructor(symbolRenderContribitions) {
-        super(), this.symbolRenderContribitions = symbolRenderContribitions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(symbolRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(symbol, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -15083,8 +15143,8 @@
         };
       };
     let DefaultCanvasTextRender = class extends BaseRender {
-      constructor(textRenderContribitions) {
-        super(), this.textRenderContribitions = textRenderContribitions, this.numberType = TEXT_NUMBER_TYPE, this.builtinContributions = [defaultTextBackgroundRenderContribution], this.init(textRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = TEXT_NUMBER_TYPE, this.builtinContributions = [defaultTextBackgroundRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(text, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -15288,8 +15348,8 @@
         };
       };
     let DefaultCanvasPolygonRender = class extends BaseRender {
-      constructor(polygonRenderContribitions) {
-        super(), this.polygonRenderContribitions = polygonRenderContribitions, this.numberType = POLYGON_NUMBER_TYPE, this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution], this.init(polygonRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = POLYGON_NUMBER_TYPE, this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(polygon, context, x, y, drawContext, params, fillCb, strokeCb) {
         const polygonAttribute = getTheme(polygon, null == params ? void 0 : params.theme).polygon,
@@ -15344,6 +15404,9 @@
       constructor(groupRenderContribitions) {
         this.groupRenderContribitions = groupRenderContribitions, this.numberType = GROUP_NUMBER_TYPE;
       }
+      reInit() {
+        this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || [], this._groupRenderContribitions.push(defaultGroupBackgroundRenderContribution);
+      }
       drawShape(group, context, x, y, drawContext, params, fillCb, strokeCb) {
         const groupAttribute = getTheme(group, null == params ? void 0 : params.theme).group,
           {
@@ -15474,8 +15537,8 @@
       };
     const repeatStr = ["", "repeat-x", "repeat-y", "repeat"];
     let DefaultCanvasImageRender = class extends BaseRender {
-      constructor(imageRenderContribitions) {
-        super(), this.imageRenderContribitions = imageRenderContribitions, this.numberType = IMAGE_NUMBER_TYPE, this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution], this.init(imageRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = IMAGE_NUMBER_TYPE, this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(image, context, x, y, drawContext, params, fillCb, strokeCb) {
         const imageAttribute = getTheme(image).image,
@@ -15797,6 +15860,9 @@
       afterDraw(params) {
         this.drawContribution.afterDraw && this.drawContribution.afterDraw(this, Object.assign({}, this.drawParams));
       }
+      reInit() {
+        this.drawContribution.reInit();
+      }
       render(groups, params) {
         this.renderTreeRoots = groups, this.drawParams = params;
         const updateBounds = params.updateBounds;
@@ -16198,6 +16264,11 @@
       constructor(contributions, drawItemInterceptorContributions) {
         this.contributions = contributions, this.drawItemInterceptorContributions = drawItemInterceptorContributions, this.currentRenderMap = new Map(), this.defaultRenderMap = new Map(), this.styleRenderMap = new Map(), this.dirtyBounds = new Bounds$1(), this.backupDirtyBounds = new Bounds$1(), this.global = application.global, this.layerService = application.layerService, isArray$9(this.contributions) || (this.contributions = [this.contributions]), this.init();
       }
+      reInit() {
+        this.init(), this.contributions.forEach(item => {
+          item.reInit();
+        });
+      }
       init() {
         this.contributions.forEach(item => {
           if (item.style) {
@@ -17322,6 +17393,9 @@
       getPickerService() {
         return this.pickerService || (this.pickerService = container.get(PickerService)), this.pickerService;
       }
+      reInit() {
+        this.renderService.reInit(), this.pickerService.reInit();
+      }
     }
 
     function createStage(params) {
@@ -17611,6 +17685,9 @@
       constructor(pickItemInterceptorContributions, pickServiceInterceptorContributions) {
         this.pickItemInterceptorContributions = pickItemInterceptorContributions, this.pickServiceInterceptorContributions = pickServiceInterceptorContributions, this.type = "default", this.global = application.global;
       }
+      reInit() {
+        this._init();
+      }
       _init() {
         this.InterceptorContributions = this.pickItemInterceptorContributions.getContributions().sort((a, b) => a.order - b.order), this.pickerServiceInterceptorContributions = this.pickServiceInterceptorContributions.getContributions().sort((a, b) => a.order - b.order);
       }
@@ -33490,6 +33567,9 @@
         release() {
             super.release?.();
             this.lastFilterRules = null;
+            this.clearSortedMap();
+            this.clearCurrentIndexedData();
+            this.currentPagerIndexedData.length = 0;
         }
         clearSortedMap() {
             this.currentIndexedData && (this.currentIndexedData.length = 0);
@@ -35878,7 +35958,14 @@
     }
     function _setDataSource(table, dataSource) {
         _dealWithUpdateDataSource(table, () => {
-            table.internalProps.dataSource && table.internalProps.dataSource.release?.();
+            if (table.internalProps.dataSource) {
+                table.internalProps.releaseList.forEach(releaseObj => {
+                    if (releaseObj instanceof DataSource) {
+                        releaseObj.release();
+                        table.internalProps.releaseList.splice(table.internalProps.releaseList.indexOf(releaseObj), 1);
+                    }
+                });
+            }
             if (dataSource) {
                 if (dataSource instanceof DataSource) {
                     table.internalProps.dataSource = dataSource;
@@ -39137,8 +39224,16 @@
             cellGroup = createSparkLineCellGroup(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, table, cellTheme, isAsync);
         }
         else if (type === 'checkbox') {
-            const createCheckboxCellGroup = Factory.getFunction('createCheckboxCellGroup');
-            cellGroup = createCheckboxCellGroup(null, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, table, cellTheme, define, range, isAsync);
+            const isAggregation = 'isAggregation' in table.internalProps.layoutMap && table.internalProps.layoutMap.isAggregation(col, row);
+            const isSeriesNumber = table.internalProps.layoutMap.isSeriesNumber(col, row);
+            if (isAggregation && isSeriesNumber) {
+                const createTextCellGroup = Factory.getFunction('createTextCellGroup');
+                cellGroup = createTextCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, false, undefined, true, cellTheme, range, isAsync);
+            }
+            else {
+                const createCheckboxCellGroup = Factory.getFunction('createCheckboxCellGroup');
+                cellGroup = createCheckboxCellGroup(null, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, table, cellTheme, define, range, isAsync);
+            }
         }
         else if (type === 'radio') {
             const createRadioCellGroup = Factory.getFunction('createRadioCellGroup');
@@ -45266,9 +45361,12 @@
                         ? table.getHeaderDefine(colForDefine, rowForDefine)
                         : table.getBodyColumnDefine(colForDefine, rowForDefine);
             }
+            const isAggregation = 'isAggregation' in table.internalProps.layoutMap && table.internalProps.layoutMap.isAggregation(col, row);
+            const isSeriesNumber = table.internalProps.layoutMap.isSeriesNumber(col, row);
             let mayHaveIcon = cellLocation !== 'body'
                 ? true
-                : define?.dragOrder || !!define?.icon || !!define?.tree;
+                : (define?.dragOrder || !!define?.icon || !!define?.tree) &&
+                    !(isAggregation && isSeriesNumber);
             if (!range &&
                 (table.internalProps.enableTreeNodeMerge || cellLocation !== 'body' || define?.mergeCell)) {
                 range = table.getCellRange(col, row);
@@ -48909,8 +49007,11 @@
     function moveRowFromBodyToColHeader(scene) {
         let hasSetedHeight = false;
         for (let i = 0; i < scene.bodyGroup.childrenCount; i++) {
-            const colGroup = scene.bodyGroup.children[i];
-            const rowCell = colGroup.firstChild;
+            const child = scene.bodyGroup.children[i];
+            if (!checkBeforeMove(child)) {
+                continue;
+            }
+            const rowCell = child.firstChild;
             scene.colHeaderGroup.children[i]?.appendChild(rowCell);
             if (!hasSetedHeight) {
                 scene.colHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height + rowCell.attribute.height);
@@ -48922,8 +49023,11 @@
     function moveRowFromRowHeaderToCornerHeader(scene) {
         let hasSetedHeight = false;
         for (let i = 0; i < scene.rowHeaderGroup.childrenCount; i++) {
-            const colGroup = scene.rowHeaderGroup.children[i];
-            const rowCell = colGroup.firstChild;
+            const child = scene.rowHeaderGroup.children[i];
+            if (!checkBeforeMove(child)) {
+                continue;
+            }
+            const rowCell = child.firstChild;
             scene.cornerHeaderGroup.children[i]?.appendChild(rowCell);
             if (!hasSetedHeight) {
                 scene.cornerHeaderGroup.setAttribute('height', scene.cornerHeaderGroup.attribute.height + rowCell.attribute.height);
@@ -48935,8 +49039,11 @@
     function moveRowFromRightToTopRightCorner(scene) {
         let hasSetedHeight = false;
         for (let i = 0; i < scene.rightFrozenGroup.childrenCount; i++) {
-            const colGroup = scene.rightFrozenGroup.children[i];
-            const rowCell = colGroup.firstChild;
+            const child = scene.rightFrozenGroup.children[i];
+            if (!checkBeforeMove(child)) {
+                continue;
+            }
+            const rowCell = child.firstChild;
             scene.rightTopCornerGroup.children[i]?.appendChild(rowCell);
             if (!hasSetedHeight) {
                 scene.rightTopCornerGroup.setAttribute('height', scene.rightTopCornerGroup.attribute.height + rowCell.attribute.height);
@@ -48948,9 +49055,16 @@
     function moveRowFromColHeaderToBody(scene) {
         let hasSetedHeight = false;
         for (let i = 0; i < scene.colHeaderGroup.childrenCount; i++) {
-            const colGroup = scene.colHeaderGroup.children[i];
-            const rowCell = colGroup.lastChild;
-            insertBefore(scene.bodyGroup.children[i], rowCell, scene.bodyGroup.children[i].firstChild);
+            const child = scene.colHeaderGroup.children[i];
+            if (!checkBeforeMove(child)) {
+                continue;
+            }
+            const target = scene.bodyGroup.children[i];
+            if (!target) {
+                continue;
+            }
+            const rowCell = child.lastChild;
+            insertBefore(target, rowCell, target.firstChild);
             if (!hasSetedHeight) {
                 scene.colHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height - rowCell.attribute.height);
                 scene.bodyGroup.setAttribute('height', scene.bodyGroup.attribute.height + rowCell.attribute.height);
@@ -48961,9 +49075,16 @@
     function moveRowFromCornerHeaderToRowHeader(scene) {
         let hasSetedHeight = false;
         for (let i = 0; i < scene.cornerHeaderGroup.childrenCount; i++) {
-            const colGroup = scene.cornerHeaderGroup.children[i];
-            const rowCell = colGroup.lastChild;
-            insertBefore(scene.rowHeaderGroup.children[i], rowCell, scene.rowHeaderGroup.children[i].firstChild);
+            const child = scene.cornerHeaderGroup.children[i];
+            if (!checkBeforeMove(child)) {
+                continue;
+            }
+            const target = scene.rowHeaderGroup.children[i];
+            if (!target) {
+                continue;
+            }
+            const rowCell = child.lastChild;
+            insertBefore(target, rowCell, target.firstChild);
             if (!hasSetedHeight) {
                 scene.cornerHeaderGroup.setAttribute('height', scene.cornerHeaderGroup.attribute.height - rowCell.attribute.height);
                 scene.rowHeaderGroup.setAttribute('height', scene.rowHeaderGroup.attribute.height + rowCell.attribute.height);
@@ -48974,9 +49095,16 @@
     function moveRowFromTopRightCornerToRight(scene) {
         let hasSetedHeight = false;
         for (let i = 0; i < scene.rightTopCornerGroup.childrenCount; i++) {
-            const colGroup = scene.rightTopCornerGroup.children[i];
-            const rowCell = colGroup.lastChild;
-            insertBefore(scene.rightFrozenGroup.children[i], rowCell, scene.rightFrozenGroup.children[i].firstChild);
+            const child = scene.rightTopCornerGroup.children[i];
+            if (!checkBeforeMove(child)) {
+                continue;
+            }
+            const target = scene.rightFrozenGroup.children[i];
+            if (!target) {
+                continue;
+            }
+            const rowCell = child.lastChild;
+            insertBefore(target, rowCell, target.firstChild);
             if (!hasSetedHeight) {
                 scene.rightTopCornerGroup.setAttribute('height', scene.rightTopCornerGroup.attribute.height - rowCell.attribute.height);
                 scene.rightFrozenGroup.setAttribute('height', scene.rightFrozenGroup.attribute.height + rowCell.attribute.height);
@@ -48984,6 +49112,9 @@
             }
         }
     }
+    function checkBeforeMove(child) {
+        return child instanceof Group$1 && child?.name !== 'table-border-rect';
+    }
 
     function updateChartSizeForResizeColWidth(scenegraph, col) {
         const { table } = scenegraph;
@@ -50964,15 +51095,19 @@
                 table._clearColRangeWidthsMap();
                 const canvasWidth = table.tableNoFrameWidth;
                 let actualHeaderWidth = 0;
-                for (let col = 0; col < table.colCount; col++) {
-                    if (col < table.rowHeaderLevelCount ||
-                        (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)) {
-                        const colWidth = table.getColWidth(col);
-                        actualHeaderWidth += colWidth;
+                let startCol = 0;
+                let endCol = table.colCount;
+                if (table.widthAdaptiveMode === 'only-body') {
+                    for (let col = 0; col < table.colCount; col++) {
+                        if (col < table.rowHeaderLevelCount ||
+                            (table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount)) {
+                            const colWidth = table.getColWidth(col);
+                            actualHeaderWidth += colWidth;
+                        }
                     }
+                    startCol = table.rowHeaderLevelCount;
+                    endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
                 }
-                const startCol = table.rowHeaderLevelCount;
-                const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
                 getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, false, [], table, true);
             }
             else if (table.autoFillWidth) {
@@ -55327,47 +55462,6 @@
                 });
             }
         });
-        const globalPointerupCallback = (e) => {
-            const target = e.target;
-            if (!table.getElement().contains(target)) {
-                const isCompleteEdit = table.editorManager?.completeEdit(e);
-                getPromiseValue(isCompleteEdit, isCompleteEdit => {
-                    if (isCompleteEdit === false) {
-                        return;
-                    }
-                    stateManager.updateInteractionState(InteractionState.default);
-                    eventManager.dealTableHover();
-                });
-            }
-        };
-        const globalPointerdownCallback = (e) => {
-            const target = e.target;
-            if (!table.getElement().contains(target) && !table.internalProps.menuHandler.containElement(target)) {
-                const isCompleteEdit = table.editorManager?.completeEdit(e);
-                getPromiseValue(isCompleteEdit, isCompleteEdit => {
-                    if (isCompleteEdit === false) {
-                        return;
-                    }
-                    if (table.options.select?.outsideClickDeselect) {
-                        const isHasSelected = !!stateManager.select.ranges?.length;
-                        eventManager.dealTableSelect();
-                        stateManager.endSelectCells(true, 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) => {
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
                 table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
@@ -56580,13 +56674,27 @@
         const globalPointerdownCallback = (e) => {
             table.eventManager.LastBodyPointerXY = { x: e.x, y: e.y };
             table.eventManager.isDown = true;
+            const target = e.target;
+            if (!table.getElement().contains(target) && !table.internalProps.menuHandler.containElement(target)) {
+                const isCompleteEdit = table.editorManager?.completeEdit(e);
+                getPromiseValue(isCompleteEdit, isCompleteEdit => {
+                    if (isCompleteEdit === false) {
+                        return;
+                    }
+                    if (table.options.select?.outsideClickDeselect) {
+                        const isHasSelected = !!stateManager.select.ranges?.length;
+                        eventManager.dealTableSelect();
+                        stateManager.endSelectCells(true, isHasSelected);
+                    }
+                });
+            }
         };
         eventManager.globalEventListeners.push({
             name: 'pointerdown',
-            env: 'body',
+            env: 'vglobal',
             callback: globalPointerdownCallback
         });
-        document.body.addEventListener('pointerdown', globalPointerdownCallback);
+        vglobal.addEventListener('pointerdown', globalPointerdownCallback);
         const globalPointerupOutsideCallback = (e) => {
             if (stateManager.menu.isShow) {
                 setTimeout(() => {
@@ -56644,13 +56752,25 @@
                 const endMoveColSuccess = table.stateManager.endMoveCol();
                 fireMoveColEventListeners(table, endMoveColSuccess, e);
             }
+            else if (table.editorManager.editingEditor) {
+                if (!table.getElement().contains(target)) {
+                    const isCompleteEdit = table.editorManager?.completeEdit(e);
+                    getPromiseValue(isCompleteEdit, (isCompleteEdit) => {
+                        if (isCompleteEdit === false) {
+                            return;
+                        }
+                        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) => {
             if (table.eventManager.isDown && table.eventManager.LastBodyPointerXY) {
                 const lastX = table.eventManager.LastBodyPointerXY?.x ?? e.x;
@@ -56784,10 +56904,10 @@
         };
         eventManager.globalEventListeners.push({
             name: 'pointermove',
-            env: 'body',
+            env: 'vglobal',
             callback: globalPointermoveCallback
         });
-        document.body.addEventListener('pointermove', globalPointermoveCallback);
+        vglobal.addEventListener('pointermove', globalPointermoveCallback);
     }
 
     function bindTouchListener(eventManager) {
@@ -56800,9 +56920,10 @@
                 return;
             }
             eventManager.isTouchdown = true;
+            const touchEvent = e.nativeEvent;
             eventManager.touchMovePoints.push({
-                x: e.page.x,
-                y: e.page.y,
+                x: touchEvent.changedTouches?.[0]?._canvasX ?? e.canvas?.x ?? e.page.x,
+                y: touchEvent.changedTouches?.[0]?._canvasY ?? e.canvas?.y ?? e.page.y,
                 timestamp: Date.now()
             });
         });
@@ -56821,8 +56942,8 @@
                     eventManager.touchMovePoints.shift();
                 }
                 eventManager.touchMovePoints.push({
-                    x: e.changedTouches[0].pageX,
-                    y: e.changedTouches[0].pageY,
+                    x: e.changedTouches[0]._canvasX ?? e.changedTouches[0].pageX,
+                    y: e.changedTouches[0]._canvasY ?? e.changedTouches[0].pageY,
                     timestamp: Date.now()
                 });
                 if (eventManager._enableTableScroll) {
@@ -56840,10 +56961,10 @@
                 }
             }
         };
-        window.addEventListener('touchmove', globalTouchMoveCallback, { passive: false });
+        vglobal.addEventListener('touchmove', globalTouchMoveCallback, { passive: false });
         eventManager.globalEventListeners.push({
             name: 'touchmove',
-            env: 'window',
+            env: 'vglobal',
             callback: globalTouchMoveCallback
         });
         const globalTouchEndCallback = (e) => {
@@ -56861,8 +56982,8 @@
                         eventManager.touchMovePoints.shift();
                     }
                     eventManager.touchMovePoints.push({
-                        x: e.changedTouches[0].pageX,
-                        y: e.changedTouches[0].pageY,
+                        x: e.changedTouches[0]._canvasX ?? e.changedTouches[0].pageX,
+                        y: e.changedTouches[0]._canvasY ?? e.changedTouches[0].pageY,
                         timestamp: Date.now()
                     });
                     if (eventManager._enableTableScroll) {
@@ -56880,10 +57001,10 @@
             eventManager.isTouchdown = false;
             eventManager.touchMovePoints = [];
         };
-        window.addEventListener('touchend', globalTouchEndCallback);
+        vglobal.addEventListener('touchend', globalTouchEndCallback);
         eventManager.globalEventListeners.push({
             name: 'touchend',
-            env: 'window',
+            env: 'vglobal',
             callback: globalTouchEndCallback
         });
         const globalTouchCancelCallback = (e) => {
@@ -56895,10 +57016,10 @@
             eventManager.isTouchdown = false;
             eventManager.touchMovePoints = [];
         };
-        window.addEventListener('touchcancel', globalTouchCancelCallback);
+        vglobal.addEventListener('touchcancel', globalTouchCancelCallback);
         eventManager.globalEventListeners.push({
             name: 'touchcancel',
-            env: 'window',
+            env: 'vglobal',
             callback: globalTouchCancelCallback
         });
     }
@@ -57690,6 +57811,9 @@
                 else if (item.env === 'window') {
                     window.removeEventListener(item.name, item.callback);
                 }
+                else if (item.env === 'vglobal') {
+                    vglobal.removeEventListener(item.name, item.callback);
+                }
             });
             this.globalEventListeners = [];
         }
@@ -62307,7 +62431,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.18.1";
+        version = "1.18.2-alpha.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -63257,6 +63381,14 @@
             const w = this.getColsWidth(0, this.internalProps.colCount - 1);
             return w;
         }
+        getColsWidths() {
+            const maxCount = this.colCount;
+            const widths = [];
+            for (let col = 0; col < maxCount; col++) {
+                widths.push(this.getColWidth(col));
+            }
+            return widths;
+        }
         getMaxColWidth(col) {
             const obj = this.colWidthsLimit[col];
             let max = (obj && obj.max) ?? Infinity;
@@ -69432,6 +69564,7 @@
             return this.dataSource.records.length;
         }
         updateColumns(columns) {
+            this.scenegraph.clearCells();
             const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
             this.internalProps.columns = cloneDeepSpec(columns, ['children']);
             generateAggregationForColumn(this);
@@ -69444,7 +69577,6 @@
                 this.dataSource.processRecords(this.dataSource.dataSourceObj?.records ?? this.dataSource.dataSourceObj);
             }
             this.internalProps.useOneRowHeightFillAll = false;
-            this.scenegraph.clearCells();
             this.headerStyleCache = new Map();
             this.bodyStyleCache = new Map();
             this.bodyBottomStyleCache = new Map();
@@ -69509,7 +69641,9 @@
                     if (record?.vtableMerge) {
                         return '';
                     }
-                    value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount);
+                    if (!table.internalProps.layoutMap.isAggregation(col, row)) {
+                        value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount);
+                    }
                 }
                 else {
                     value = row - this.columnHeaderLevelCount + 1;
@@ -69640,7 +69774,9 @@
             }
             return ifCan;
         }
-        updateOption(options) {
+        updateOption(options, updateConfig = {
+            keepData: false
+        }) {
             const internalProps = this.internalProps;
             super.updateOption(options);
             internalProps.frozenColDragHeaderMode =
@@ -69662,10 +69798,18 @@
             this.internalProps.useOneRowHeightFillAll = false;
             this.internalProps.columnWidthConfig = options.columnWidthConfig;
             if (internalProps.releaseList) {
-                internalProps.releaseList.forEach(releaseObj => releaseObj?.release?.());
-                internalProps.releaseList = null;
+                for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
+                    const releaseObj = internalProps.releaseList[i];
+                    if (updateConfig.keepData && releaseObj instanceof DataSource) {
+                        releaseObj.updateColumns(this.internalProps.columns);
+                    }
+                    else {
+                        releaseObj?.release?.();
+                        internalProps.releaseList.splice(i, 1);
+                    }
+                }
             }
-            if (options.dataSource) {
+            if (options.dataSource && this.dataSource !== options.dataSource) {
                 this.dataSource = options.dataSource;
             }
             else if (options.records) {
@@ -69674,6 +69818,7 @@
                 });
             }
             else {
+                this.refreshRowColCount();
                 this._resetFrozenColCount();
                 this.scenegraph.createSceneGraph();
                 this.render();
@@ -79061,10 +79206,10 @@
                 needLowestLevel_colPaths = true;
                 needLowestLevel_rowPaths = true;
             }
-            if (colHeaderPaths.length >= this.columnHeaderLevelCount) {
+            if (colHeaderPaths.length >= this._getColumnHeaderTreeExpandedMaxLevelCount()) {
                 needLowestLevel_colPaths = true;
             }
-            if (rowHeaderPaths.length >= this.rowHeaderLevelCount) {
+            if (rowHeaderPaths.length >= this._getRowHeaderTreeExpandedMaxLevelCount()) {
                 needLowestLevel_rowPaths = true;
             }
             let col;
@@ -85167,7 +85312,7 @@
     }
 
     registerForVrender();
-    const version = "1.18.1";
+    const version = "1.18.2-alpha.2";
     function getIcons() {
         return get$2();
     }