@visactor/vtable-calendar 1.18.1 → 1.18.2-alpha.2

package/dist/vtable-calendar.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$16 = 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);
       }
@@ -31649,7 +31726,7 @@
       }
       release() {
         var _a;
-        null === (_a = super.release) || void 0 === _a || _a.call(this), this.lastFilterRules = null;
+        null === (_a = super.release) || void 0 === _a || _a.call(this), this.lastFilterRules = null, this.clearSortedMap(), this.clearCurrentIndexedData(), this.currentPagerIndexedData.length = 0;
       }
       clearSortedMap() {
         this.currentIndexedData && (this.currentIndexedData.length = 0), this.currentIndexedData = null, this.sortedIndexMap.forEach(item => {
@@ -33674,8 +33751,9 @@
     }
     function _setDataSource(table, dataSource) {
       _dealWithUpdateDataSource(table, () => {
-        var _a, _b;
-        table.internalProps.dataSource && (null === (_b = (_a = table.internalProps.dataSource).release) || void 0 === _b || _b.call(_a)), dataSource ? dataSource instanceof DataSource ? (table.internalProps.dataSource = dataSource, table.internalProps.dataSource.supplementConfig(table.pagination, table.options.columns, table.internalProps.layoutMap.rowHierarchyType, getHierarchyExpandLevel(table))) : table.internalProps.dataSource = new CachedDataSource(dataSource) : table.internalProps.dataSource = DataSource.EMPTY, table.addReleaseObj(table.internalProps.dataSource), table.internalProps.records = null;
+        table.internalProps.dataSource && table.internalProps.releaseList.forEach(releaseObj => {
+          releaseObj instanceof DataSource && (releaseObj.release(), table.internalProps.releaseList.splice(table.internalProps.releaseList.indexOf(releaseObj), 1));
+        }), dataSource ? dataSource instanceof DataSource ? (table.internalProps.dataSource = dataSource, table.internalProps.dataSource.supplementConfig(table.pagination, table.options.columns, table.internalProps.layoutMap.rowHierarchyType, getHierarchyExpandLevel(table))) : table.internalProps.dataSource = new CachedDataSource(dataSource) : table.internalProps.dataSource = DataSource.EMPTY, table.addReleaseObj(table.internalProps.dataSource), table.internalProps.records = null;
       });
     }
     function _getTargetFrozenRowAt(table, absoluteY) {
@@ -35584,7 +35662,13 @@
       } else if ("sparkline" === type) {
         cellGroup = Factory.getFunction("createSparkLineCellGroup")(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, table, cellTheme, isAsync);
       } else if ("checkbox" === type) {
-        cellGroup = Factory.getFunction("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),
+          isSeriesNumber = table.internalProps.layoutMap.isSeriesNumber(col, row);
+        if (isAggregation && isSeriesNumber) {
+          cellGroup = Factory.getFunction("createTextCellGroup")(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, void 0, !0, cellTheme, range, isAsync);
+        } else {
+          cellGroup = Factory.getFunction("createCheckboxCellGroup")(null, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, table, cellTheme, define, range, isAsync);
+        }
       } else if ("radio" === type) {
         cellGroup = Factory.getFunction("createRadioCellGroup")(null, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, table, cellTheme, define, range);
       } else if ("switch" === type) {
@@ -39512,7 +39596,9 @@
           colForDefine = col,
           rowForDefine = row;
         range && (colForDefine = range.start.col, rowForDefine = range.start.row), !table.isPivotTable() && ("columnHeader" === cellLocation || "cornerHeader" === cellLocation) && row >= table.columnHeaderLevelCount && (cellLocation = "body"), define = !table.isPivotTable() && table.isSeriesNumberInBody(col, row) ? table.getBodyColumnDefine(colForDefine, rowForDefine) : "body" !== cellLocation ? table.getHeaderDefine(colForDefine, rowForDefine) : table.getBodyColumnDefine(colForDefine, rowForDefine);
-        let mayHaveIcon = "body" !== cellLocation || (null == define ? void 0 : define.dragOrder) || !!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree);
+        const isAggregation = "isAggregation" in table.internalProps.layoutMap && table.internalProps.layoutMap.isAggregation(col, row),
+          isSeriesNumber = table.internalProps.layoutMap.isSeriesNumber(col, row);
+        let mayHaveIcon = "body" !== cellLocation || ((null == define ? void 0 : define.dragOrder) || !!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree)) && !(isAggregation && isSeriesNumber);
         if (!range && (table.internalProps.enableTreeNodeMerge || "body" !== cellLocation || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row), isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row, isMerge)) {
           const mergeSize = dealMerge(range, mergeMap, table, rowStart > range.start.row);
           cellWidth = mergeSize.cellWidth, cellHeight = mergeSize.cellHeight;
@@ -41630,7 +41716,9 @@
       var _a;
       let hasSetedHeight = !1;
       for (let i = 0; i < scene.bodyGroup.childrenCount; i++) {
-        const rowCell = scene.bodyGroup.children[i].firstChild;
+        const child = scene.bodyGroup.children[i];
+        if (!checkBeforeMove(child)) continue;
+        const rowCell = child.firstChild;
         null === (_a = scene.colHeaderGroup.children[i]) || void 0 === _a || _a.appendChild(rowCell), hasSetedHeight || (scene.colHeaderGroup.setAttribute("height", scene.colHeaderGroup.attribute.height + rowCell.attribute.height), scene.bodyGroup.setAttribute("height", scene.bodyGroup.attribute.height - rowCell.attribute.height), hasSetedHeight = !0);
       }
     }
@@ -41638,7 +41726,9 @@
       var _a;
       let hasSetedHeight = !1;
       for (let i = 0; i < scene.rowHeaderGroup.childrenCount; i++) {
-        const rowCell = scene.rowHeaderGroup.children[i].firstChild;
+        const child = scene.rowHeaderGroup.children[i];
+        if (!checkBeforeMove(child)) continue;
+        const rowCell = child.firstChild;
         null === (_a = scene.cornerHeaderGroup.children[i]) || void 0 === _a || _a.appendChild(rowCell), hasSetedHeight || (scene.cornerHeaderGroup.setAttribute("height", scene.cornerHeaderGroup.attribute.height + rowCell.attribute.height), scene.rowHeaderGroup.setAttribute("height", scene.rowHeaderGroup.attribute.height - rowCell.attribute.height), hasSetedHeight = !0);
       }
     }
@@ -41646,31 +41736,48 @@
       var _a;
       let hasSetedHeight = !1;
       for (let i = 0; i < scene.rightFrozenGroup.childrenCount; i++) {
-        const rowCell = scene.rightFrozenGroup.children[i].firstChild;
+        const child = scene.rightFrozenGroup.children[i];
+        if (!checkBeforeMove(child)) continue;
+        const rowCell = child.firstChild;
         null === (_a = scene.rightTopCornerGroup.children[i]) || void 0 === _a || _a.appendChild(rowCell), hasSetedHeight || (scene.rightTopCornerGroup.setAttribute("height", scene.rightTopCornerGroup.attribute.height + rowCell.attribute.height), scene.rightFrozenGroup.setAttribute("height", scene.rightFrozenGroup.attribute.height - rowCell.attribute.height), hasSetedHeight = !0);
       }
     }
     function moveRowFromColHeaderToBody(scene) {
       let hasSetedHeight = !1;
       for (let i = 0; i < scene.colHeaderGroup.childrenCount; i++) {
-        const rowCell = scene.colHeaderGroup.children[i].lastChild;
-        insertBefore(scene.bodyGroup.children[i], rowCell, scene.bodyGroup.children[i].firstChild), hasSetedHeight || (scene.colHeaderGroup.setAttribute("height", scene.colHeaderGroup.attribute.height - rowCell.attribute.height), scene.bodyGroup.setAttribute("height", scene.bodyGroup.attribute.height + rowCell.attribute.height), hasSetedHeight = !0);
+        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), hasSetedHeight || (scene.colHeaderGroup.setAttribute("height", scene.colHeaderGroup.attribute.height - rowCell.attribute.height), scene.bodyGroup.setAttribute("height", scene.bodyGroup.attribute.height + rowCell.attribute.height), hasSetedHeight = !0);
       }
     }
     function moveRowFromCornerHeaderToRowHeader(scene) {
       let hasSetedHeight = !1;
       for (let i = 0; i < scene.cornerHeaderGroup.childrenCount; i++) {
-        const rowCell = scene.cornerHeaderGroup.children[i].lastChild;
-        insertBefore(scene.rowHeaderGroup.children[i], rowCell, scene.rowHeaderGroup.children[i].firstChild), hasSetedHeight || (scene.cornerHeaderGroup.setAttribute("height", scene.cornerHeaderGroup.attribute.height - rowCell.attribute.height), scene.rowHeaderGroup.setAttribute("height", scene.rowHeaderGroup.attribute.height + rowCell.attribute.height), hasSetedHeight = !0);
+        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), hasSetedHeight || (scene.cornerHeaderGroup.setAttribute("height", scene.cornerHeaderGroup.attribute.height - rowCell.attribute.height), scene.rowHeaderGroup.setAttribute("height", scene.rowHeaderGroup.attribute.height + rowCell.attribute.height), hasSetedHeight = !0);
       }
     }
     function moveRowFromTopRightCornerToRight(scene) {
       let hasSetedHeight = !1;
       for (let i = 0; i < scene.rightTopCornerGroup.childrenCount; i++) {
-        const rowCell = scene.rightTopCornerGroup.children[i].lastChild;
-        insertBefore(scene.rightFrozenGroup.children[i], rowCell, scene.rightFrozenGroup.children[i].firstChild), hasSetedHeight || (scene.rightTopCornerGroup.setAttribute("height", scene.rightTopCornerGroup.attribute.height - rowCell.attribute.height), scene.rightFrozenGroup.setAttribute("height", scene.rightFrozenGroup.attribute.height + rowCell.attribute.height), hasSetedHeight = !0);
+        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), hasSetedHeight || (scene.rightTopCornerGroup.setAttribute("height", scene.rightTopCornerGroup.attribute.height - rowCell.attribute.height), scene.rightFrozenGroup.setAttribute("height", scene.rightFrozenGroup.attribute.height + rowCell.attribute.height), hasSetedHeight = !0);
       }
     }
+    function checkBeforeMove(child) {
+      return child instanceof Group && "table-border-rect" !== (null == child ? void 0 : child.name);
+    }
 
     function updateChartSizeForResizeColWidth(scenegraph, col) {
       const {
@@ -42765,12 +42872,15 @@
         if ("adaptive" === table.widthMode) {
           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) {
-            actualHeaderWidth += table.getColWidth(col);
+          let actualHeaderWidth = 0,
+            startCol = 0,
+            endCol = table.colCount;
+          if ("only-body" === table.widthAdaptiveMode) {
+            for (let col = 0; col < table.colCount; col++) if (col < table.rowHeaderLevelCount || table.isPivotChart() && col >= table.colCount - table.rightFrozenColCount) {
+              actualHeaderWidth += table.getColWidth(col);
+            }
+            startCol = table.rowHeaderLevelCount, endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
           }
-          const startCol = table.rowHeaderLevelCount,
-            endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
           getAdaptiveWidth(canvasWidth - actualHeaderWidth, startCol, endCol, !1, [], table, !0);
         } else if (table.autoFillWidth) {
           table._clearColRangeWidthsMap();
@@ -45416,40 +45526,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
@@ -46141,18 +46218,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();
@@ -46177,13 +46268,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) {
@@ -46239,9 +46335,9 @@
       };
       eventManager.globalEventListeners.push({
         name: "pointermove",
-        env: "body",
+        env: "vglobal",
         callback: globalPointermoveCallback
-      }), document.body.addEventListener("pointermove", globalPointermoveCallback);
+      }), vglobal.addEventListener("pointermove", globalPointermoveCallback);
     }
 
     function bindTouchListener(eventManager) {
@@ -46249,17 +46345,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,
@@ -46270,23 +46370,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) => {
@@ -46299,17 +46399,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
       });
     }
@@ -46801,7 +46901,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() {
@@ -49435,7 +49535,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.18.1", 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.2-alpha.2", 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
@@ -49961,6 +50061,12 @@
         if (this.internalProps.colCount <= 0) return 0;
         return this.getColsWidth(0, this.internalProps.colCount - 1);
       }
+      getColsWidths() {
+        const maxCount = this.colCount,
+          widths = [];
+        for (let col = 0; col < maxCount; col++) widths.push(this.getColWidth(col));
+        return widths;
+      }
       getMaxColWidth(col) {
         var _a;
         const obj = this.colWidthsLimit[col];
@@ -54200,11 +54306,12 @@
       }
       updateColumns(columns) {
         var _a, _b, _c, _d;
+        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), this.options.columns = columns, this.internalProps.headerHelper.setTableColumnsEditor(), this._hasAutoImageColumn = void 0, this.refreshHeader(), null === (_b = (_a = this.dataSource).updateColumns) || void 0 === _b || _b.call(_a, this.internalProps.columns), this.records && checkHasAggregationOnColumnDefine(columns) && this.dataSource.processRecords(null !== (_d = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records) && void 0 !== _d ? _d : this.dataSource.dataSourceObj), this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.clearCells(), this.headerStyleCache = new Map(), this.bodyStyleCache = new Map(), this.bodyBottomStyleCache = new Map(), this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.renderAsync(), this.eventManager.updateEventBinder();
+        this.internalProps.columns = cloneDeepSpec(columns, ["children"]), generateAggregationForColumn(this), this.options.columns = columns, this.internalProps.headerHelper.setTableColumnsEditor(), this._hasAutoImageColumn = void 0, this.refreshHeader(), null === (_b = (_a = this.dataSource).updateColumns) || void 0 === _b || _b.call(_a, this.internalProps.columns), this.records && checkHasAggregationOnColumnDefine(columns) && this.dataSource.processRecords(null !== (_d = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records) && void 0 !== _d ? _d : this.dataSource.dataSourceObj), this.internalProps.useOneRowHeightFillAll = !1, this.headerStyleCache = new Map(), this.bodyStyleCache = new Map(), this.bodyBottomStyleCache = new Map(), this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.renderAsync(), this.eventManager.updateEventBinder();
       }
       addColumn(column) {
         const columns = this.options.columns;
@@ -54244,7 +54351,7 @@
           if (this.options.groupBy) {
             const record = table.getCellRawRecord(col, row);
             if (null == record ? void 0 : record.vtableMerge) return "";
-            value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount);
+            table.internalProps.layoutMap.isAggregation(col, row) || (value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount));
           } else value = row - this.columnHeaderLevelCount + 1;
           const {
             format: format
@@ -54375,20 +54482,24 @@
         return ifCan;
       }
       updateOption(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        let updateConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+          keepData: !1
+        };
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const internalProps = this.internalProps;
-        if (super.updateOption(options), internalProps.frozenColDragHeaderMode = null !== (_b = null === (_a = options.dragOrder) || void 0 === _a ? void 0 : _a.frozenColDragHeaderMode) && void 0 !== _b ? _b : options.frozenColDragHeaderMode, this.pagination = options.pagination, internalProps.sortState = options.sortState, internalProps.dataConfig = options.groupBy ? getGroupByDataConfig(options.groupBy) : {}, this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, ["children"]) : options.header ? cloneDeepSpec(options.header, ["children"]) : [], generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_e = null !== (_d = options.enableTreeNodeMerge) && void 0 !== _d ? _d : isValid$3(options.groupBy)) && void 0 !== _e && _e, this.internalProps.headerHelper.setTableColumnsEditor(), this.transpose = null !== (_f = options.transpose) && void 0 !== _f && _f, this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.columnWidthConfig = options.columnWidthConfig, internalProps.releaseList && (internalProps.releaseList.forEach(releaseObj => {
-          var _a;
-          return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
-        }), internalProps.releaseList = null), options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
+        if (super.updateOption(options), internalProps.frozenColDragHeaderMode = null !== (_b = null === (_a = options.dragOrder) || void 0 === _a ? void 0 : _a.frozenColDragHeaderMode) && void 0 !== _b ? _b : options.frozenColDragHeaderMode, this.pagination = options.pagination, internalProps.sortState = options.sortState, internalProps.dataConfig = options.groupBy ? getGroupByDataConfig(options.groupBy) : {}, this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, ["children"]) : options.header ? cloneDeepSpec(options.header, ["children"]) : [], generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_e = null !== (_d = options.enableTreeNodeMerge) && void 0 !== _d ? _d : isValid$3(options.groupBy)) && void 0 !== _e && _e, this.internalProps.headerHelper.setTableColumnsEditor(), this.transpose = null !== (_f = options.transpose) && void 0 !== _f && _f, this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.columnWidthConfig = options.columnWidthConfig, internalProps.releaseList) for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
+          const releaseObj = internalProps.releaseList[i];
+          updateConfig.keepData && releaseObj instanceof DataSource ? releaseObj.updateColumns(this.internalProps.columns) : (null === (_g = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _g || _g.call(releaseObj), internalProps.releaseList.splice(i, 1));
+        }
+        if (options.dataSource && this.dataSource !== options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
           sortState: options.sortState
-        }) : (this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), this.render()), options.title) {
+        }) : (this.refreshRowColCount(), this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), this.render()), options.title) {
           const Title = Factory.getComponent("title");
           internalProps.title = new Title(options.title, this), this.scenegraph.resize();
         }
-        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_g = this.internalProps.emptyTip) || void 0 === _g || _g.resetVisible();else {
+        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible();else {
           const EmptyTip = Factory.getComponent("emptyTip");
-          this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible();
+          this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_j = this.internalProps.emptyTip) || void 0 === _j || _j.resetVisible();
         }
         return new Promise(resolve => {
           setTimeout(resolve, 0);