@visactor/vchart 2.1.0-alpha.0 → 2.1.0-alpha.2

package/esm/mark/component.d.ts

@@ -8,11 +8,20 @@ export declare class ComponentMark extends BaseMark<ICommonSpec> implements ICom
     type: string;
     private _componentType;
     private _component;
+    private _exitingComponent?;
+    private _exitingProduct?;
     private _mode;
     constructor(name: string, option: IMarkOption);
     protected _getDefaultStyle(): IMarkStyle<ICommonSpec>;
     getComponent(): IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;
+    private _clearExitingComponent;
+    private _removeProductAfterExit;
+    private _registerExitingComponent;
+    private _unregisterExitingComponent;
+    private _releaseComponentWithExitAnimation;
     clearComponent(): void;
+    releaseWithExitAnimation(): boolean;
+    forceReleaseExitAnimation(): void;
     protected _getAttrsFromConfig(attrs?: IGroupGraphicAttribute): IGroupGraphicAttribute;
     protected _attributesTransform: (attrs: any) => any;
     setAttributeTransform(t: (attrs: any) => any): void;

package/esm/mark/component.js

@@ -6,6 +6,8 @@ import { isNil } from "@visactor/vutils";
 
 import { HOOK_EVENT } from "../constant/event";
 
+import { releaseVRenderComponent, releaseVRenderComponentSync } from "../component/base/release-vrender-component";
+
 export class ComponentMark extends BaseMark {
     constructor(name, option) {
         super(name, option), this.type = "component", this._componentType = option.componentType, 
@@ -17,10 +19,53 @@ export class ComponentMark extends BaseMark {
     getComponent() {
         return this._component;
     }
+    _clearExitingComponent(component) {
+        this._exitingComponent === component && (this._unregisterExitingComponent(component), 
+        this._exitingComponent = void 0, this._exitingProduct = void 0);
+    }
+    _removeProductAfterExit(component, product) {
+        product.parent && product.parent.removeChild(product, !0), this._product === product && (this._product = null, 
+        this._compiledProductId = null), this._clearExitingComponent(component);
+    }
+    _registerExitingComponent(component) {
+        var _a, _b, _c, _d, _e;
+        null === (_e = null === (_d = null === (_c = null === (_b = null === (_a = this.model) || void 0 === _a ? void 0 : _a.getOption) || void 0 === _b ? void 0 : _b.call(_a)) || void 0 === _c ? void 0 : _c.globalInstance) || void 0 === _d ? void 0 : _d._registerExitingVRenderComponent) || void 0 === _e || _e.call(_d, component);
+    }
+    _unregisterExitingComponent(component) {
+        var _a, _b, _c, _d, _e;
+        null === (_e = null === (_d = null === (_c = null === (_b = null === (_a = this.model) || void 0 === _a ? void 0 : _a.getOption) || void 0 === _b ? void 0 : _b.call(_a)) || void 0 === _c ? void 0 : _c.globalInstance) || void 0 === _d ? void 0 : _d._unregisterExitingVRenderComponent) || void 0 === _e || _e.call(_d, component);
+    }
+    _releaseComponentWithExitAnimation(component, releaseProduct) {
+        var _a, _b;
+        const product = this._product;
+        if (!component || (null === (_b = null === (_a = this.model) || void 0 === _a ? void 0 : _a._shouldReleaseVRenderComponentsImmediately) || void 0 === _b ? void 0 : _b.call(_a))) return !1;
+        const releasedWithExit = releaseVRenderComponent(component, {
+            enableExitAnimation: !0,
+            removeFromParent: !0,
+            onComplete: () => {
+                releaseProduct && product ? this._removeProductAfterExit(component, product) : this._clearExitingComponent(component);
+            }
+        });
+        return releasedWithExit && (this._exitingComponent = component, this._exitingProduct = releaseProduct ? product : void 0, 
+        this._registerExitingComponent(component)), releasedWithExit;
+    }
     clearComponent() {
-        this._component && (this._component.parent && this._component.parent.removeChild(this._component), 
+        var _a, _b;
+        const component = this._component;
+        component && ((null === (_b = null === (_a = this.model) || void 0 === _a ? void 0 : _a._shouldReleaseVRenderComponentsImmediately) || void 0 === _b ? void 0 : _b.call(_a)) ? releaseVRenderComponentSync(component) : this._releaseComponentWithExitAnimation(component, !1), 
         this._component = null);
     }
+    releaseWithExitAnimation() {
+        const component = this._component;
+        return !!this._releaseComponentWithExitAnimation(component, !0) && (this._component = null, 
+        this._exitingComponent = component, !0);
+    }
+    forceReleaseExitAnimation() {
+        var _a;
+        this._exitingComponent && (releaseVRenderComponentSync(this._exitingComponent), 
+        this._unregisterExitingComponent(this._exitingComponent), (null === (_a = this._exitingProduct) || void 0 === _a ? void 0 : _a.parent) && this._exitingProduct.parent.removeChild(this._exitingProduct, !0), 
+        this._exitingComponent = void 0, this._exitingProduct = void 0);
+    }
     _getAttrsFromConfig(attrs = {}) {
         const configAttrs = super._getAttrsFromConfig(attrs);
         return isNil(this._markConfig.interactive) || (configAttrs.pickable = this._markConfig.interactive), 
@@ -49,7 +94,11 @@ export class ComponentMark extends BaseMark {
         }), this.needClear = !0;
     }
     release() {
-        super.release(), this.removeProduct();
+        var _a, _b;
+        return (null === (_b = null === (_a = this.model) || void 0 === _a ? void 0 : _a._shouldReleaseVRenderComponentsImmediately) || void 0 === _b ? void 0 : _b.call(_a)) ? (this.forceReleaseExitAnimation(), 
+        super.release(), void this.removeProduct(!0)) : this._exitingComponent ? (this._releaseComponentWithExitAnimation(this._exitingComponent, !0) || this.removeProduct(!0), 
+        void super.release()) : void (this.releaseWithExitAnimation() ? super.release() : (super.release(), 
+        this.removeProduct(!0)));
     }
 }
 

package/esm/mark/component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":"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","file":"component.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ICommonSpec } from '../typings';\nimport { BaseMark } from './base/base-mark';\nimport type { IComponentMark, IMarkOption, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport type { IGraphic, IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { isNil } from '@visactor/vutils';\nimport { HOOK_EVENT } from '../constant/event';\n\nexport class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {\n  static readonly type = MarkTypeEnum.component;\n  type: string = 'component';\n\n  private _componentType: string;\n  private _component: IGraphic;\n  private _mode: '2d' | '3d';\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n    // 这里需要将 type 指定为具体的组件名称，即调用 vgrammar 的 registerComponent API 注册的组件名称\n    this._componentType = option.componentType;\n\n    this._mode = option.mode;\n  }\n\n  protected _getDefaultStyle(): IMarkStyle<ICommonSpec> {\n    return {};\n  }\n\n  getComponent() {\n    return this._component;\n  }\n  clearComponent() {\n    if (this._component) {\n      if (this._component.parent) {\n        this._component.parent.removeChild(this._component);\n      }\n\n      this._component = null;\n    }\n  }\n\n  protected _getAttrsFromConfig(attrs: IGroupGraphicAttribute = {}) {\n    const configAttrs = super._getAttrsFromConfig(attrs);\n\n    if (!isNil(this._markConfig.interactive)) {\n      configAttrs.pickable = this._markConfig.interactive;\n    }\n    return attrs;\n  }\n\n  protected _attributesTransform: (attrs: any) => any;\n  setAttributeTransform(t: (attrs: any) => any) {\n    this._attributesTransform = t;\n  }\n\n  renderInner() {\n    const style = this._simpleStyle ?? this.getAttributesOfState({});\n\n    let attrs = this._getAttrsFromConfig(style as unknown as IGroupGraphicAttribute);\n\n    if (this._attributesTransform) {\n      attrs = this._attributesTransform(attrs);\n    }\n\n    if (this._animationConfig) {\n      attrs = {\n        ...attrs,\n        animation: true,\n        animationAppear: this._animationConfig.appear\n          ? Array.isArray(this._animationConfig.appear)\n            ? this._animationConfig.appear[0]\n            : this._animationConfig.appear\n          : undefined,\n        animationEnter: this._animationConfig.enter\n          ? Array.isArray(this._animationConfig.enter)\n            ? this._animationConfig.enter[0]\n            : this._animationConfig.enter\n          : undefined,\n        animationUpdate: this._animationConfig.update\n          ? Array.isArray(this._animationConfig.update)\n            ? this._animationConfig.update[0]\n            : this._animationConfig.update\n          : undefined,\n        animationExit: this._animationConfig.exit\n          ? Array.isArray(this._animationConfig.exit)\n            ? this._animationConfig.exit[0]\n            : this._animationConfig.exit\n          : undefined\n      } as any;\n    }\n\n    if (!this._component) {\n      this._component = Factory.createGraphicComponent(this._componentType, attrs, {\n        mode: this._mode,\n        skipDefault: this._markConfig.skipTheme\n      });\n      this._component && this._product.appendChild(this._component);\n    } else {\n      this._component.setAttributes(attrs as any);\n    }\n\n    if (this._component) {\n      this._component.context = this._getCommonContext();\n    }\n\n    if (this._markConfig.support3d && this._product) {\n      this._product.setMode('3d');\n    }\n\n    this.model.event.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, {\n      mark: this,\n      model: this.model\n    });\n    this.needClear = true;\n  }\n\n  release() {\n    super.release();\n    this.removeProduct();\n  }\n}\n\nexport const registerComponentMark = () => {\n  Factory.registerMark(ComponentMark.type, ComponentMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":"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","file":"component.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ICommonSpec } from '../typings';\nimport { BaseMark } from './base/base-mark';\nimport type { IComponentMark, IMarkOption, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport type { IGraphic, IGroup, IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { isNil } from '@visactor/vutils';\nimport { HOOK_EVENT } from '../constant/event';\nimport { releaseVRenderComponent, releaseVRenderComponentSync } from '../component/base/release-vrender-component';\n\nexport class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {\n  static readonly type = MarkTypeEnum.component;\n  type: string = 'component';\n\n  private _componentType: string;\n  private _component: IGraphic;\n  private _exitingComponent?: IGraphic;\n  private _exitingProduct?: IGroup;\n  private _mode: '2d' | '3d';\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n    // 这里需要将 type 指定为具体的组件名称，即调用 vgrammar 的 registerComponent API 注册的组件名称\n    this._componentType = option.componentType;\n\n    this._mode = option.mode;\n  }\n\n  protected _getDefaultStyle(): IMarkStyle<ICommonSpec> {\n    return {};\n  }\n\n  getComponent() {\n    return this._component;\n  }\n\n  private _clearExitingComponent(component: IGraphic) {\n    if (this._exitingComponent === component) {\n      this._unregisterExitingComponent(component);\n      this._exitingComponent = undefined;\n      this._exitingProduct = undefined;\n    }\n  }\n\n  private _removeProductAfterExit(component: IGraphic, product: IGroup) {\n    if (product.parent) {\n      product.parent.removeChild(product, true);\n    }\n    if (this._product === product) {\n      this._product = null;\n      this._compiledProductId = null;\n    }\n    this._clearExitingComponent(component);\n  }\n\n  private _registerExitingComponent(component: IGraphic) {\n    (this.model as any)?.getOption?.()?.globalInstance?._registerExitingVRenderComponent?.(component);\n  }\n\n  private _unregisterExitingComponent(component: IGraphic) {\n    (this.model as any)?.getOption?.()?.globalInstance?._unregisterExitingVRenderComponent?.(component);\n  }\n\n  private _releaseComponentWithExitAnimation(component: IGraphic, releaseProduct: boolean) {\n    const product = this._product;\n\n    if (!component || (this.model as any)?._shouldReleaseVRenderComponentsImmediately?.()) {\n      return false;\n    }\n\n    const releasedWithExit = releaseVRenderComponent(component, {\n      enableExitAnimation: true,\n      removeFromParent: true,\n      onComplete: () => {\n        if (releaseProduct && product) {\n          this._removeProductAfterExit(component, product);\n        } else {\n          this._clearExitingComponent(component);\n        }\n      }\n    });\n\n    if (releasedWithExit) {\n      this._exitingComponent = component;\n      this._exitingProduct = releaseProduct ? product : undefined;\n      this._registerExitingComponent(component);\n    }\n\n    return releasedWithExit;\n  }\n\n  clearComponent() {\n    const component = this._component;\n\n    if (!component) {\n      return;\n    }\n\n    if ((this.model as any)?._shouldReleaseVRenderComponentsImmediately?.()) {\n      releaseVRenderComponentSync(component);\n    } else {\n      this._releaseComponentWithExitAnimation(component, false);\n    }\n\n    this._component = null;\n  }\n\n  releaseWithExitAnimation() {\n    const component = this._component;\n\n    if (!this._releaseComponentWithExitAnimation(component, true)) {\n      return false;\n    }\n\n    this._component = null;\n    this._exitingComponent = component;\n    return true;\n  }\n\n  forceReleaseExitAnimation() {\n    if (!this._exitingComponent) {\n      return;\n    }\n\n    releaseVRenderComponentSync(this._exitingComponent);\n    this._unregisterExitingComponent(this._exitingComponent);\n    if (this._exitingProduct?.parent) {\n      this._exitingProduct.parent.removeChild(this._exitingProduct, true);\n    }\n    this._exitingComponent = undefined;\n    this._exitingProduct = undefined;\n  }\n\n  protected _getAttrsFromConfig(attrs: IGroupGraphicAttribute = {}) {\n    const configAttrs = super._getAttrsFromConfig(attrs);\n\n    if (!isNil(this._markConfig.interactive)) {\n      configAttrs.pickable = this._markConfig.interactive;\n    }\n    return attrs;\n  }\n\n  protected _attributesTransform: (attrs: any) => any;\n  setAttributeTransform(t: (attrs: any) => any) {\n    this._attributesTransform = t;\n  }\n\n  renderInner() {\n    const style = this._simpleStyle ?? this.getAttributesOfState({});\n\n    let attrs = this._getAttrsFromConfig(style as unknown as IGroupGraphicAttribute);\n\n    if (this._attributesTransform) {\n      attrs = this._attributesTransform(attrs);\n    }\n\n    if (this._animationConfig) {\n      attrs = {\n        ...attrs,\n        animation: true,\n        animationAppear: this._animationConfig.appear\n          ? Array.isArray(this._animationConfig.appear)\n            ? this._animationConfig.appear[0]\n            : this._animationConfig.appear\n          : undefined,\n        animationEnter: this._animationConfig.enter\n          ? Array.isArray(this._animationConfig.enter)\n            ? this._animationConfig.enter[0]\n            : this._animationConfig.enter\n          : undefined,\n        animationUpdate: this._animationConfig.update\n          ? Array.isArray(this._animationConfig.update)\n            ? this._animationConfig.update[0]\n            : this._animationConfig.update\n          : undefined,\n        animationExit: this._animationConfig.exit\n          ? Array.isArray(this._animationConfig.exit)\n            ? this._animationConfig.exit[0]\n            : this._animationConfig.exit\n          : undefined\n      } as any;\n    }\n\n    if (!this._component) {\n      this._component = Factory.createGraphicComponent(this._componentType, attrs, {\n        mode: this._mode,\n        skipDefault: this._markConfig.skipTheme\n      });\n      this._component && this._product.appendChild(this._component);\n    } else {\n      this._component.setAttributes(attrs as any);\n    }\n\n    if (this._component) {\n      this._component.context = this._getCommonContext();\n    }\n\n    if (this._markConfig.support3d && this._product) {\n      this._product.setMode('3d');\n    }\n\n    this.model.event.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, {\n      mark: this,\n      model: this.model\n    });\n    this.needClear = true;\n  }\n\n  release() {\n    if ((this.model as any)?._shouldReleaseVRenderComponentsImmediately?.()) {\n      this.forceReleaseExitAnimation();\n      super.release();\n      this.removeProduct(true);\n      return;\n    }\n\n    if (this._exitingComponent) {\n      if (!this._releaseComponentWithExitAnimation(this._exitingComponent, true)) {\n        this.removeProduct(true);\n      }\n      super.release();\n      return;\n    }\n\n    if (this.releaseWithExitAnimation()) {\n      super.release();\n      return;\n    }\n\n    super.release();\n    this.removeProduct(true);\n  }\n}\n\nexport const registerComponentMark = () => {\n  Factory.registerMark(ComponentMark.type, ComponentMark);\n};\n"]}

package/esm/mark/group.js

@@ -88,7 +88,7 @@ export class GroupMark extends BaseMark {
         }));
     }
     release() {
-        super.release(), this.removeProduct();
+        super.release(), this.removeProduct(!0);
     }
 }
 

package/esm/mark/group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { Maybe } from '../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { log, warn } from '../util/debug';\nimport type { IGroupMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport {\n  DiffState,\n  type AnimationStateValues,\n  type IGroupMark,\n  type IMark,\n  type IMarkGraphic,\n  type MarkType\n} from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { type IMarkCompileOption } from '../compile/mark';\nimport type { IGroup, IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { registerGroup, registerShadowRoot } from '@visactor/vrender-kits';\nimport { isNil } from '@visactor/vutils';\nimport { traverseGroupMark } from '../compile/util';\nimport { getDiffAttributesOfGraphic } from '../util/mark';\n\nexport class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {\n  static readonly type = MarkTypeEnum.group;\n  readonly type = GroupMark.type;\n  protected _marks: IMark[] = [];\n  getMarks(): IMark[] {\n    return this._marks;\n  }\n\n  protected _diffState = DiffState.enter;\n  protected declare _product: Maybe<IGroup>;\n  declare getProduct: () => Maybe<IGroup>;\n\n  protected isMarkExist(mark: IMark): boolean {\n    return this._marks.find(m => m.id === mark.id) !== undefined;\n  }\n\n  addMark(mark: IMark): boolean {\n    if (this.isMarkExist(mark)) {\n      warn('Mark already exists, add mark failed.');\n      return false;\n    }\n\n    this._marks.push(mark);\n    return true;\n  }\n\n  removeMark(mark: IMark): boolean {\n    const index = this._marks.findIndex(m => m.id === mark.id || m.name === mark.name);\n    if (index === -1) {\n      warn('Mark does not exists, removeMark failed.');\n      return false;\n    }\n    this._marks.splice(index, 1);\n    return true;\n  }\n\n  getMarkInType(type: MarkType) {\n    return this._marks.filter(m => m.type === type);\n  }\n\n  getMarkInId(id: number) {\n    return this._marks.find(m => m.id === id);\n  }\n\n  getMarkInUserId(id: string | number) {\n    let result: IMark | undefined;\n    traverseGroupMark(\n      this,\n      m => {\n        result = m;\n      },\n      m => m.getUserId() === id,\n      null,\n      true\n    );\n\n    return result;\n  }\n\n  getMarkInName(name: string) {\n    return this._marks.filter(m => m.name === name);\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption): void {\n    // 编译自身\n    super._compileProduct(option);\n\n    // 设置zIndex\n    // this._product.configure({\n    //   zIndex: this._markConfig.zIndex\n    // });\n\n    // 编译子元素\n    this.getMarks().forEach(mark => {\n      mark.compile({ group: this._product });\n    });\n  }\n\n  protected _getAttrsFromConfig(attrs: IGroupGraphicAttribute = {}) {\n    const configAttrs = super._getAttrsFromConfig(attrs);\n\n    if (!isNil(this._markConfig.interactive)) {\n      configAttrs.pickable = this._markConfig.interactive;\n    }\n    return attrs;\n  }\n\n  getGraphics(): IMarkGraphic[] {\n    return [this._product as unknown as IMarkGraphic];\n  }\n\n  renderInner() {\n    if (!this._product) {\n      return;\n    }\n\n    const style = this._simpleStyle ?? this.getAttributesOfState({});\n\n    this._product.context = {\n      ...this._product.context,\n      ...this._getCommonContext(),\n      diffState: this._diffState\n    };\n    this._setAnimationState(this._product as unknown as IMarkGraphic);\n    const newAttrs = this._getAttrsFromConfig(style);\n\n    // TODO: 需要优化，现在group mark 走了一些特殊逻辑\n    if (this._product.context.diffState === DiffState.update) {\n      const hasAnimation = this.hasAnimation();\n      const diffAttrs = getDiffAttributesOfGraphic(this._product as unknown as IMarkGraphic, newAttrs);\n      this._product.context.diffAttrs = diffAttrs;\n\n      if (!this.hasAnimationByState(this._product.context.animationState)) {\n        hasAnimation ? this._product.setAttributesAndPreventAnimate(diffAttrs) : this._product.setAttributes(diffAttrs);\n      }\n\n      if (hasAnimation) {\n        this._product.setFinalAttributes(newAttrs);\n      }\n    } else {\n      this._product.setAttributes(newAttrs);\n    }\n\n    this.needClear = true;\n  }\n\n  clearExitGraphics() {\n    // group 暂时不需要clear元素，完成首次渲染后 将状态设置为update\n    this._diffState = DiffState.update;\n  }\n\n  render(): void {\n    if (this._isCommited) {\n      log(`render mark: ${this.getProductId()}, type is ${this.type}`);\n      this.renderInner();\n      this.uncommit();\n    }\n\n    this.getMarks().forEach(mark => {\n      mark.render();\n    });\n  }\n\n  release() {\n    super.release();\n    this.removeProduct();\n  }\n}\n\nexport const registerGroupMark = () => {\n  registerShadowRoot();\n  registerGroup();\n  Factory.registerMark(GroupMark.type, GroupMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,SAAS,EAMV,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,OAAO,SAAU,SAAQ,QAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;QACrB,WAAM,GAAY,EAAE,CAAC;QAKrB,eAAU,GAAG,SAAS,CAAC,KAAK,CAAC;IA2IzC,CAAC;IA/IC,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAMS,WAAW,CAAC,IAAW;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC;IAC/D,CAAC;IAED,OAAO,CAAC,IAAW;QACjB,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAC9C,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,IAAW;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,IAAI,CAAC,0CAA0C,CAAC,CAAC;YACjD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,IAAc;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,eAAe,CAAC,EAAmB;QACjC,IAAI,MAAyB,CAAC;QAC9B,iBAAiB,CACf,IAAI,EACJ,CAAC,CAAC,EAAE;YACF,MAAM,GAAG,CAAC,CAAC;QACb,CAAC,EACD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EACzB,IAAI,EACJ,IAAI,CACL,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAClD,CAAC;IAES,eAAe,CAAC,MAA2B;QAEnD,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAQ9B,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAES,mBAAmB,CAAC,QAAgC,EAAE;QAC9D,MAAM,WAAW,GAAG,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE;YACxC,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;SACrD;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW;QACT,OAAO,CAAC,IAAI,CAAC,QAAmC,CAAC,CAAC;IACpD,CAAC;IAED,WAAW;;QACT,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,YAAY,mCAAI,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,CAAC,OAAO,iDAChB,IAAI,CAAC,QAAQ,CAAC,OAAO,GACrB,IAAI,CAAC,iBAAiB,EAAE,KAC3B,SAAS,EAAE,IAAI,CAAC,UAAU,GAC3B,CAAC;QACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAmC,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAGjD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,MAAM,EAAE;YACxD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,0BAA0B,CAAC,IAAI,CAAC,QAAmC,EAAE,QAAQ,CAAC,CAAC;YACjG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;YAE5C,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;gBACnE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;aACjH;YAED,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;aAC5C;SACF;aAAM;YACL,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SACvC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,iBAAiB;QAEf,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IACrC,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,GAAG,CAAC,gBAAgB,IAAI,CAAC,YAAY,EAAE,aAAa,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACjB;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;;AAjJe,cAAI,WAAsB;AAoJ5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,kBAAkB,EAAE,CAAC;IACrB,aAAa,EAAE,CAAC;IAChB,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAClD,CAAC,CAAC","file":"group.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { Maybe } from '../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { log, warn } from '../util/debug';\nimport type { IGroupMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport {\n  DiffState,\n  type AnimationStateValues,\n  type IGroupMark,\n  type IMark,\n  type IMarkGraphic,\n  type MarkType\n} from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { type IMarkCompileOption } from '../compile/mark';\nimport type { IGroup, IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { registerGroup, registerShadowRoot } from '@visactor/vrender-kits';\nimport { isNil } from '@visactor/vutils';\nimport { traverseGroupMark } from '../compile/util';\nimport { getDiffAttributesOfGraphic } from '../util/mark';\n\nexport class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {\n  static readonly type = MarkTypeEnum.group;\n  readonly type = GroupMark.type;\n  protected _marks: IMark[] = [];\n  getMarks(): IMark[] {\n    return this._marks;\n  }\n\n  protected _diffState = DiffState.enter;\n  protected declare _product: Maybe<IGroup>;\n  declare getProduct: () => Maybe<IGroup>;\n\n  protected isMarkExist(mark: IMark): boolean {\n    return this._marks.find(m => m.id === mark.id) !== undefined;\n  }\n\n  addMark(mark: IMark): boolean {\n    if (this.isMarkExist(mark)) {\n      warn('Mark already exists, add mark failed.');\n      return false;\n    }\n\n    this._marks.push(mark);\n    return true;\n  }\n\n  removeMark(mark: IMark): boolean {\n    const index = this._marks.findIndex(m => m.id === mark.id || m.name === mark.name);\n    if (index === -1) {\n      warn('Mark does not exists, removeMark failed.');\n      return false;\n    }\n    this._marks.splice(index, 1);\n    return true;\n  }\n\n  getMarkInType(type: MarkType) {\n    return this._marks.filter(m => m.type === type);\n  }\n\n  getMarkInId(id: number) {\n    return this._marks.find(m => m.id === id);\n  }\n\n  getMarkInUserId(id: string | number) {\n    let result: IMark | undefined;\n    traverseGroupMark(\n      this,\n      m => {\n        result = m;\n      },\n      m => m.getUserId() === id,\n      null,\n      true\n    );\n\n    return result;\n  }\n\n  getMarkInName(name: string) {\n    return this._marks.filter(m => m.name === name);\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption): void {\n    // 编译自身\n    super._compileProduct(option);\n\n    // 设置zIndex\n    // this._product.configure({\n    //   zIndex: this._markConfig.zIndex\n    // });\n\n    // 编译子元素\n    this.getMarks().forEach(mark => {\n      mark.compile({ group: this._product });\n    });\n  }\n\n  protected _getAttrsFromConfig(attrs: IGroupGraphicAttribute = {}) {\n    const configAttrs = super._getAttrsFromConfig(attrs);\n\n    if (!isNil(this._markConfig.interactive)) {\n      configAttrs.pickable = this._markConfig.interactive;\n    }\n    return attrs;\n  }\n\n  getGraphics(): IMarkGraphic[] {\n    return [this._product as unknown as IMarkGraphic];\n  }\n\n  renderInner() {\n    if (!this._product) {\n      return;\n    }\n\n    const style = this._simpleStyle ?? this.getAttributesOfState({});\n\n    this._product.context = {\n      ...this._product.context,\n      ...this._getCommonContext(),\n      diffState: this._diffState\n    };\n    this._setAnimationState(this._product as unknown as IMarkGraphic);\n    const newAttrs = this._getAttrsFromConfig(style);\n\n    // TODO: 需要优化，现在group mark 走了一些特殊逻辑\n    if (this._product.context.diffState === DiffState.update) {\n      const hasAnimation = this.hasAnimation();\n      const diffAttrs = getDiffAttributesOfGraphic(this._product as unknown as IMarkGraphic, newAttrs);\n      this._product.context.diffAttrs = diffAttrs;\n\n      if (!this.hasAnimationByState(this._product.context.animationState)) {\n        hasAnimation ? this._product.setAttributesAndPreventAnimate(diffAttrs) : this._product.setAttributes(diffAttrs);\n      }\n\n      if (hasAnimation) {\n        this._product.setFinalAttributes(newAttrs);\n      }\n    } else {\n      this._product.setAttributes(newAttrs);\n    }\n\n    this.needClear = true;\n  }\n\n  clearExitGraphics() {\n    // group 暂时不需要clear元素，完成首次渲染后 将状态设置为update\n    this._diffState = DiffState.update;\n  }\n\n  render(): void {\n    if (this._isCommited) {\n      log(`render mark: ${this.getProductId()}, type is ${this.type}`);\n      this.renderInner();\n      this.uncommit();\n    }\n\n    this.getMarks().forEach(mark => {\n      mark.render();\n    });\n  }\n\n  release() {\n    super.release();\n    this.removeProduct(true);\n  }\n}\n\nexport const registerGroupMark = () => {\n  registerShadowRoot();\n  registerGroup();\n  Factory.registerMark(GroupMark.type, GroupMark);\n};\n"]}

package/esm/mark/interface/mark.d.ts

@@ -6,6 +6,8 @@ import type { MarkType } from './type';
 export interface IComponentMark extends IMarkRaw<ICommonSpec> {
     getComponent: () => IGraphic;
     clearComponent: () => void;
+    releaseWithExitAnimation: () => boolean;
+    forceReleaseExitAnimation: () => void;
     setAttributeTransform: (t: (attrs: any) => any) => any;
 }
 export interface IGlyphMark<T extends ICommonSpec = ICommonSpec, C = any> extends IMarkRaw<T> {

package/esm/mark/interface/mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/interface/mark.ts"],"names":[],"mappings":"","file":"mark.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender-core';\nimport type { IMarkSpec } from '../../typings';\nimport type {\n  IArcMarkSpec,\n  IAreaMarkSpec,\n  IBoxPlotMarkSpec,\n  ICellMarkSpec,\n  ICommonSpec,\n  IComposedTextMarkSpec,\n  IGroupMarkSpec,\n  IImageMarkSpec,\n  ILineMarkSpec,\n  ILinkPathMarkSpec,\n  IPathMarkSpec,\n  IPolygonMarkSpec,\n  IRectMarkSpec,\n  IRippleMarkSpec,\n  IRuleMarkSpec,\n  ISymbolMarkSpec\n} from '../../typings/visual';\nimport type { IMark, IMarkRaw } from './common';\nimport type { MarkType } from './type';\n\nexport interface IComponentMark extends IMarkRaw<ICommonSpec> {\n  getComponent: () => IGraphic;\n  clearComponent: () => void;\n  setAttributeTransform: (t: (attrs: any) => any) => any;\n}\n\nexport interface IGlyphMark<T extends ICommonSpec = ICommonSpec, C = any> extends IMarkRaw<T> {\n  setGlyphConfig: (cfg: C) => void;\n  getGlyphConfig: () => C;\n\n  getSubMarks: () => Record<\n    string,\n    {\n      type: MarkType;\n      defaultAttributes?: any;\n    }\n  >;\n\n  getPositionChannels: () => string[];\n}\n\nexport interface ILabelMark extends ITextMark {\n  skipEncode: boolean;\n\n  getRule: () => string;\n  setRule: (rule: string) => void;\n\n  getTarget: () => IMark;\n  setTarget: (target: IMark) => void;\n\n  getComponent: () => IComponentMark;\n  setComponent: (component: IComponentMark) => void;\n}\n\nexport type ITextMark = IMarkRaw<IComposedTextMarkSpec> & { getTextType: () => 'text' | 'rich' };\n\nexport type ITextSpec<T> = IMarkSpec<T> & { textType?: 'rich' | 'text' };\n\nexport type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;\n\nexport type IArcMark = IMarkRaw<IArcMarkSpec>;\n\nexport type IAreaMark = IMarkRaw<IAreaMarkSpec>;\n\nexport type IBoxPlotMark = IMarkRaw<IBoxPlotMarkSpec>;\n\nexport type ICellMark = IMarkRaw<ICellMarkSpec>;\n\nexport type IImageMark = IMarkRaw<IImageMarkSpec>;\n\nexport type ILineMark = IMarkRaw<ILineMarkSpec>;\n\nexport type ILinkPathMark = IMarkRaw<ILinkPathMarkSpec>;\n\nexport type IPathMark = IMarkRaw<IPathMarkSpec>;\n\nexport type IRectMark = IMarkRaw<IRectMarkSpec>;\n\nexport type IRippleMark = IMarkRaw<IRippleMarkSpec>;\n\nexport type IRuleMark = IMarkRaw<IRuleMarkSpec>;\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {\n  // groupMark的zIndex只能配在外层，encode里不生效，且无法写成signal\n  // {type:'group', zIndex: 100} ✅\n  // {type:'group', encode:{enter:{zIndex:{value:100}}}} ❌\n  // {type:'group', zIndex: {signal: }} ❌\n\n  addMark: (m: IMark) => boolean;\n  removeMark: (m: IMark) => boolean;\n  // TODO: 这里可能会出现mark嵌套的问题\n  getMarks: () => IMark[];\n  getMarkInType: (type: MarkType) => IMark[];\n  getMarkInId: (id: number) => IMark | undefined;\n  getMarkInName: (name: string) => IMark[] | undefined;\n}\n\nexport interface ILinkPathConfig {\n  direction?: 'horizontal' | 'vertical' | 'LR' | 'RL' | 'TB' | 'BL' | 'radial';\n}\n"]}
+{"version":3,"sources":["../src/mark/interface/mark.ts"],"names":[],"mappings":"","file":"mark.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender-core';\nimport type { IMarkSpec } from '../../typings';\nimport type {\n  IArcMarkSpec,\n  IAreaMarkSpec,\n  IBoxPlotMarkSpec,\n  ICellMarkSpec,\n  ICommonSpec,\n  IComposedTextMarkSpec,\n  IGroupMarkSpec,\n  IImageMarkSpec,\n  ILineMarkSpec,\n  ILinkPathMarkSpec,\n  IPathMarkSpec,\n  IPolygonMarkSpec,\n  IRectMarkSpec,\n  IRippleMarkSpec,\n  IRuleMarkSpec,\n  ISymbolMarkSpec\n} from '../../typings/visual';\nimport type { IMark, IMarkRaw } from './common';\nimport type { MarkType } from './type';\n\nexport interface IComponentMark extends IMarkRaw<ICommonSpec> {\n  getComponent: () => IGraphic;\n  clearComponent: () => void;\n  releaseWithExitAnimation: () => boolean;\n  forceReleaseExitAnimation: () => void;\n  setAttributeTransform: (t: (attrs: any) => any) => any;\n}\n\nexport interface IGlyphMark<T extends ICommonSpec = ICommonSpec, C = any> extends IMarkRaw<T> {\n  setGlyphConfig: (cfg: C) => void;\n  getGlyphConfig: () => C;\n\n  getSubMarks: () => Record<\n    string,\n    {\n      type: MarkType;\n      defaultAttributes?: any;\n    }\n  >;\n\n  getPositionChannels: () => string[];\n}\n\nexport interface ILabelMark extends ITextMark {\n  skipEncode: boolean;\n\n  getRule: () => string;\n  setRule: (rule: string) => void;\n\n  getTarget: () => IMark;\n  setTarget: (target: IMark) => void;\n\n  getComponent: () => IComponentMark;\n  setComponent: (component: IComponentMark) => void;\n}\n\nexport type ITextMark = IMarkRaw<IComposedTextMarkSpec> & { getTextType: () => 'text' | 'rich' };\n\nexport type ITextSpec<T> = IMarkSpec<T> & { textType?: 'rich' | 'text' };\n\nexport type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;\n\nexport type IArcMark = IMarkRaw<IArcMarkSpec>;\n\nexport type IAreaMark = IMarkRaw<IAreaMarkSpec>;\n\nexport type IBoxPlotMark = IMarkRaw<IBoxPlotMarkSpec>;\n\nexport type ICellMark = IMarkRaw<ICellMarkSpec>;\n\nexport type IImageMark = IMarkRaw<IImageMarkSpec>;\n\nexport type ILineMark = IMarkRaw<ILineMarkSpec>;\n\nexport type ILinkPathMark = IMarkRaw<ILinkPathMarkSpec>;\n\nexport type IPathMark = IMarkRaw<IPathMarkSpec>;\n\nexport type IRectMark = IMarkRaw<IRectMarkSpec>;\n\nexport type IRippleMark = IMarkRaw<IRippleMarkSpec>;\n\nexport type IRuleMark = IMarkRaw<IRuleMarkSpec>;\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {\n  // groupMark的zIndex只能配在外层，encode里不生效，且无法写成signal\n  // {type:'group', zIndex: 100} ✅\n  // {type:'group', encode:{enter:{zIndex:{value:100}}}} ❌\n  // {type:'group', zIndex: {signal: }} ❌\n\n  addMark: (m: IMark) => boolean;\n  removeMark: (m: IMark) => boolean;\n  // TODO: 这里可能会出现mark嵌套的问题\n  getMarks: () => IMark[];\n  getMarkInType: (type: MarkType) => IMark[];\n  getMarkInId: (id: number) => IMark | undefined;\n  getMarkInName: (name: string) => IMark[] | undefined;\n}\n\nexport interface ILinkPathConfig {\n  direction?: 'horizontal' | 'vertical' | 'LR' | 'RL' | 'TB' | 'BL' | 'radial';\n}\n"]}

package/esm/model/base-model.d.ts

@@ -1,5 +1,5 @@
 import type { IEvent } from '../event/interface';
-import type { IEffect, IModel, IModelInitOption, IModelOption, IModelEvaluateOption, IModelSpec, IModelMarkInfo, IModelSpecInfo } from './interface';
+import type { IEffect, IModel, IModelInitOption, IModelOption, IModelEvaluateOption, IModelSpec, IModelMarkInfo, IModelSpecInfo, IUpdateSpecResult } from './interface';
 import type { CoordinateType } from '../typings/coordinate';
 import type { AnimationStateValues, ICompileMarkConfig, IMark, IMarkGraphic, IMarkOption, IMarkRaw, IMarkStyle } from '../mark/interface';
 import type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect, ILayoutRect } from '../typings';
@@ -50,20 +50,8 @@ export declare abstract class BaseModel<T extends IModelSpec> extends Compilable
     beforeRelease(): void;
     clear(): void;
     release(): void;
-    updateSpec(spec: T): {
-        change: boolean;
-        reMake: boolean;
-        reRender: boolean;
-        reSize: boolean;
-        reCompile: boolean;
-    };
-    protected _compareSpec(spec: T, prevSpec: T): {
-        change: boolean;
-        reMake: boolean;
-        reRender: boolean;
-        reSize: boolean;
-        reCompile: boolean;
-    };
+    updateSpec(spec: T): IUpdateSpecResult;
+    protected _compareSpec(spec: T, prevSpec: T): IUpdateSpecResult;
     reInit(spec?: T): void;
     updateLayoutAttribute(): void;
     setAttrFromSpec(): void;

package/esm/model/base-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { createID } from '../util/id';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport type {\n  IEffect,\n  IModel,\n  IModelInitOption,\n  IModelOption,\n  IModelEvaluateOption,\n  IModelSpec,\n  IModelMarkInfo,\n  IModelSpecInfo\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type {\n  AnimationStateValues,\n  ICompileMarkConfig,\n  IMark,\n  IMarkGraphic,\n  IMarkOption,\n  IMarkRaw,\n  IMarkStyle\n} from '../mark/interface';\nimport type {\n  Datum,\n  StateValueType,\n  ConvertToMarkStyleSpec,\n  ICommonSpec,\n  StringOrNumber,\n  IRect,\n  ILayoutRect\n} from '../typings';\nimport { isValid } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport { MarkSet } from '../mark/mark-set';\nimport type { ILayoutItem } from '../layout/interface';\nimport { CompilableBase } from '../compile/compilable-base';\nimport { PREFIX } from '../constant/base';\nimport { BaseModelSpecTransformer } from './base-model-transformer';\nimport { getProperty } from '@visactor/vutils-extension';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { ICompilableData } from '../compile/data/interface';\n\nexport abstract class BaseModel<T extends IModelSpec> extends CompilableBase implements IModel {\n  readonly transformerConstructor = BaseModelSpecTransformer;\n\n  protected _spec: T;\n  getSpec(): T {\n    return this._spec || ({} as T);\n  }\n\n  /** 获取当前 model 对应在图表 spec 上的路径 */\n  getSpecPath() {\n    return this._option?.specPath;\n  }\n\n  /** 获取当前 model 对应在图表 specInfo 上的路径 */\n  getSpecInfoPath() {\n    return this._option?.specInfoPath ?? this._option?.specPath;\n  }\n\n  readonly type: string = 'null';\n  readonly modelType: string = 'null';\n\n  readonly id;\n\n  userId: StringOrNumber | undefined = undefined;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // 数据\n  protected _data: ICompilableData = null;\n  getData() {\n    return this._data;\n  }\n\n  // 布局\n  protected _layout?: ILayoutItem = null;\n  get layout() {\n    return this._layout;\n  }\n\n  readonly specKey: string = '';\n\n  protected declare _option: IModelOption;\n  getOption() {\n    return this._option;\n  }\n\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n  getMarkNameMap() {\n    return this._marks?.getMarkNameMap();\n  }\n  getMarkSet() {\n    return this._marks;\n  }\n\n  getChart() {\n    return this._option.getChart();\n  }\n\n  protected get _theme() {\n    return this.getSpecInfo()?.theme;\n  }\n\n  /** for layout diff */\n  protected _lastLayoutRect: ILayoutRect = null;\n\n  constructor(spec: T, option: IModelOption) {\n    super(option);\n    this.id = createID();\n    this.userId = spec.id;\n    this._spec = spec;\n    this.effect = {};\n    this.event = new Event(option.eventDispatcher, option.mode);\n    option.map?.set(this.id, this);\n  }\n  coordinate?: CoordinateType;\n\n  protected _releaseEvent() {\n    this.event.release();\n  }\n\n  created() {\n    this.setAttrFromSpec();\n  }\n\n  init(option: IModelInitOption) {\n    // do nothing\n  }\n\n  afterInit() {\n    // do nothing\n  }\n\n  getVisible() {\n    return (this._spec as unknown as any)?.visible !== false;\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect): void {\n    // do nothing\n    this._layout?.onLayoutStart(layoutRect, viewRect);\n  }\n  onLayoutEnd(): void {\n    this._layout?.onLayoutEnd();\n    this.getMarks().forEach(m => m.commit(false, true));\n  }\n\n  onEvaluateEnd(ctx: IModelEvaluateOption) {\n    // do nothing\n  }\n\n  onBeforeRender() {\n    // do nothing\n  }\n\n  onDataUpdate() {\n    // do nothing\n  }\n\n  beforeRelease() {\n    // do nothing\n  }\n\n  clear() {\n    this.getMarks().forEach(m => m.clear?.());\n  }\n\n  release() {\n    this._releaseEvent();\n    this._spec = undefined;\n    this.getMarks().forEach(m => m.release());\n    this._data?.release();\n    this._data = null;\n    this._marks.clear();\n    super.release();\n  }\n\n  updateSpec(spec: T) {\n    const result = this._compareSpec(spec, this._spec);\n    // 如果发现需要改变\n    if (result.reRender || result.reMake || result.reCompile) {\n      this._layout?.setWillLayoutTag();\n    }\n    this._spec = spec;\n\n    return result;\n  }\n\n  protected _compareSpec(spec: T, prevSpec: T) {\n    const result = {\n      change: false,\n      reMake: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    return result;\n  }\n\n  reInit(spec?: T) {\n    if (spec) {\n      this._spec = spec;\n    }\n    this.setAttrFromSpec();\n  }\n\n  updateLayoutAttribute() {\n    // do nothing\n  }\n\n  setAttrFromSpec() {\n    this._layout?.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n  }\n\n  /** mark style 内部转换逻辑，override 使用 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    return { ...style };\n  }\n\n  setMarkStyle<T extends ICommonSpec>(\n    mark: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) {\n    if (!isValid(mark) || !isValid(style)) {\n      return;\n    }\n    mark.setStyle(this._convertMarkStyle(style), state, level);\n  }\n\n  initMarkStyleWithSpec(mark?: IMark, spec?: any) {\n    if (!isValid(mark) || !isValid(spec)) {\n      return;\n    }\n    const { style, state } = spec;\n    const newSpec = { ...spec };\n\n    if (style) {\n      newSpec.style = this._convertMarkStyle(style);\n    }\n    if (state) {\n      newSpec.state = {};\n      Object.keys(state).forEach(key => {\n        newSpec.state[key] = this._convertMarkStyle(state[key]);\n      });\n    }\n    mark.initStyleWithSpec(newSpec);\n  }\n\n  protected stateKeyToSignalName(key: string, opt?: string) {\n    let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n    opt && (name += `_${opt}`);\n    return name;\n  }\n\n  compileData() {\n    this._data?.compile();\n  }\n\n  compileMarks(group?: IGroup) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n    });\n  }\n\n  protected _createMark<T extends IMark>(\n    markInfo: IModelMarkInfo,\n    option: Partial<IMarkOption> = {},\n    config?: ICompileMarkConfig\n  ): T {\n    const { type, name } = markInfo;\n    const { parent, ...others } = option;\n    const m = Factory.createMark(type as any, name, {\n      model: this,\n      map: this._option.map,\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale,\n      ...others\n    }) as T;\n\n    if (parent) {\n      parent.addMark(m);\n    } else {\n      this.getCompiler().addRootMark(m);\n    }\n\n    if (m) {\n      m.created();\n      config && m.setMarkConfig(config);\n    }\n    return m;\n  }\n\n  /**\n   * 数据唯一ID\n   * 根据自身动画数据匹配需求设置返回值。\n   * 默认返回 undefined 时，根据 VGrammar 默认数据 ID 进行索引和匹配。\n   */\n  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n    return undefined;\n  }\n\n  getColorScheme() {\n    return this._option.getTheme?.('colorScheme');\n  }\n\n  getSpecInfo() {\n    const specInfo = this._option.getSpecInfo?.() ?? {};\n    return getProperty<IModelSpecInfo>(specInfo, this.getSpecInfoPath());\n  }\n\n  getSpecIndex() {\n    const path = this.getSpecPath();\n    if (!path?.length) {\n      return 0;\n    }\n    const index = Number(path[path.length - 1]);\n    if (isNaN(index)) {\n      return 0;\n    }\n    return index;\n  }\n\n  private _aniamtionStateCallback: (graphic: IMarkGraphic) => AnimationStateValues;\n\n  updateAnimateStateCallback(callback: (graphic: IMarkGraphic) => AnimationStateValues) {\n    this._aniamtionStateCallback = callback;\n  }\n\n  getAnimationStateCallback() {\n    return this._aniamtionStateCallback;\n  }\n}\n"]}
+{"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { createID } from '../util/id';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport type {\n  IEffect,\n  IModel,\n  IModelInitOption,\n  IModelOption,\n  IModelEvaluateOption,\n  IModelSpec,\n  IModelMarkInfo,\n  IModelSpecInfo,\n  IUpdateSpecResult\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type {\n  AnimationStateValues,\n  ICompileMarkConfig,\n  IMark,\n  IMarkGraphic,\n  IMarkOption,\n  IMarkRaw,\n  IMarkStyle\n} from '../mark/interface';\nimport type {\n  Datum,\n  StateValueType,\n  ConvertToMarkStyleSpec,\n  ICommonSpec,\n  StringOrNumber,\n  IRect,\n  ILayoutRect\n} from '../typings';\nimport { isValid } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport { MarkSet } from '../mark/mark-set';\nimport type { ILayoutItem } from '../layout/interface';\nimport { CompilableBase } from '../compile/compilable-base';\nimport { PREFIX } from '../constant/base';\nimport { BaseModelSpecTransformer } from './base-model-transformer';\nimport { getProperty } from '@visactor/vutils-extension';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { ICompilableData } from '../compile/data/interface';\n\nexport abstract class BaseModel<T extends IModelSpec> extends CompilableBase implements IModel {\n  readonly transformerConstructor = BaseModelSpecTransformer;\n\n  protected _spec: T;\n  getSpec(): T {\n    return this._spec || ({} as T);\n  }\n\n  /** 获取当前 model 对应在图表 spec 上的路径 */\n  getSpecPath() {\n    return this._option?.specPath;\n  }\n\n  /** 获取当前 model 对应在图表 specInfo 上的路径 */\n  getSpecInfoPath() {\n    return this._option?.specInfoPath ?? this._option?.specPath;\n  }\n\n  readonly type: string = 'null';\n  readonly modelType: string = 'null';\n\n  readonly id;\n\n  userId: StringOrNumber | undefined = undefined;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // 数据\n  protected _data: ICompilableData = null;\n  getData() {\n    return this._data;\n  }\n\n  // 布局\n  protected _layout?: ILayoutItem = null;\n  get layout() {\n    return this._layout;\n  }\n\n  readonly specKey: string = '';\n\n  protected declare _option: IModelOption;\n  getOption() {\n    return this._option;\n  }\n\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n  getMarkNameMap() {\n    return this._marks?.getMarkNameMap();\n  }\n  getMarkSet() {\n    return this._marks;\n  }\n\n  getChart() {\n    return this._option.getChart();\n  }\n\n  protected get _theme() {\n    return this.getSpecInfo()?.theme;\n  }\n\n  /** for layout diff */\n  protected _lastLayoutRect: ILayoutRect = null;\n\n  constructor(spec: T, option: IModelOption) {\n    super(option);\n    this.id = createID();\n    this.userId = spec.id;\n    this._spec = spec;\n    this.effect = {};\n    this.event = new Event(option.eventDispatcher, option.mode);\n    option.map?.set(this.id, this);\n  }\n  coordinate?: CoordinateType;\n\n  protected _releaseEvent() {\n    this.event.release();\n  }\n\n  created() {\n    this.setAttrFromSpec();\n  }\n\n  init(option: IModelInitOption) {\n    // do nothing\n  }\n\n  afterInit() {\n    // do nothing\n  }\n\n  getVisible() {\n    return (this._spec as unknown as any)?.visible !== false;\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect): void {\n    // do nothing\n    this._layout?.onLayoutStart(layoutRect, viewRect);\n  }\n  onLayoutEnd(): void {\n    this._layout?.onLayoutEnd();\n    this.getMarks().forEach(m => m.commit(false, true));\n  }\n\n  onEvaluateEnd(ctx: IModelEvaluateOption) {\n    // do nothing\n  }\n\n  onBeforeRender() {\n    // do nothing\n  }\n\n  onDataUpdate() {\n    // do nothing\n  }\n\n  beforeRelease() {\n    // do nothing\n  }\n\n  clear() {\n    this.getMarks().forEach(m => m.clear?.());\n  }\n\n  release() {\n    this._releaseEvent();\n    this._spec = undefined;\n    this.getMarks().forEach(m => m.release());\n    this._data?.release();\n    this._data = null;\n    this._marks.clear();\n    super.release();\n  }\n\n  updateSpec(spec: T) {\n    const result = this._compareSpec(spec, this._spec);\n    // 如果发现需要改变\n    if (result.reRender || result.reMake || result.reCompile) {\n      this._layout?.setWillLayoutTag();\n    }\n    this._spec = spec;\n\n    return result;\n  }\n\n  protected _compareSpec(spec: T, prevSpec: T): IUpdateSpecResult {\n    const result: IUpdateSpecResult = {\n      change: false,\n      reMake: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    return result;\n  }\n\n  reInit(spec?: T) {\n    if (spec) {\n      this._spec = spec;\n    }\n    this.setAttrFromSpec();\n  }\n\n  updateLayoutAttribute() {\n    // do nothing\n  }\n\n  setAttrFromSpec() {\n    this._layout?.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n  }\n\n  /** mark style 内部转换逻辑，override 使用 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    return { ...style };\n  }\n\n  setMarkStyle<T extends ICommonSpec>(\n    mark: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) {\n    if (!isValid(mark) || !isValid(style)) {\n      return;\n    }\n    mark.setStyle(this._convertMarkStyle(style), state, level);\n  }\n\n  initMarkStyleWithSpec(mark?: IMark, spec?: any) {\n    if (!isValid(mark) || !isValid(spec)) {\n      return;\n    }\n    const { style, state } = spec;\n    const newSpec = { ...spec };\n\n    if (style) {\n      newSpec.style = this._convertMarkStyle(style);\n    }\n    if (state) {\n      newSpec.state = {};\n      Object.keys(state).forEach(key => {\n        newSpec.state[key] = this._convertMarkStyle(state[key]);\n      });\n    }\n    mark.initStyleWithSpec(newSpec);\n  }\n\n  protected stateKeyToSignalName(key: string, opt?: string) {\n    let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n    opt && (name += `_${opt}`);\n    return name;\n  }\n\n  compileData() {\n    this._data?.compile();\n  }\n\n  compileMarks(group?: IGroup) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n    });\n  }\n\n  protected _createMark<T extends IMark>(\n    markInfo: IModelMarkInfo,\n    option: Partial<IMarkOption> = {},\n    config?: ICompileMarkConfig\n  ): T {\n    const { type, name } = markInfo;\n    const { parent, ...others } = option;\n    const m = Factory.createMark(type as any, name, {\n      model: this,\n      map: this._option.map,\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale,\n      ...others\n    }) as T;\n\n    if (parent) {\n      parent.addMark(m);\n    } else {\n      this.getCompiler().addRootMark(m);\n    }\n\n    if (m) {\n      m.created();\n      config && m.setMarkConfig(config);\n    }\n    return m;\n  }\n\n  /**\n   * 数据唯一ID\n   * 根据自身动画数据匹配需求设置返回值。\n   * 默认返回 undefined 时，根据 VGrammar 默认数据 ID 进行索引和匹配。\n   */\n  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n    return undefined;\n  }\n\n  getColorScheme() {\n    return this._option.getTheme?.('colorScheme');\n  }\n\n  getSpecInfo() {\n    const specInfo = this._option.getSpecInfo?.() ?? {};\n    return getProperty<IModelSpecInfo>(specInfo, this.getSpecInfoPath());\n  }\n\n  getSpecIndex() {\n    const path = this.getSpecPath();\n    if (!path?.length) {\n      return 0;\n    }\n    const index = Number(path[path.length - 1]);\n    if (isNaN(index)) {\n      return 0;\n    }\n    return index;\n  }\n\n  private _aniamtionStateCallback: (graphic: IMarkGraphic) => AnimationStateValues;\n\n  updateAnimateStateCallback(callback: (graphic: IMarkGraphic) => AnimationStateValues) {\n    this._aniamtionStateCallback = callback;\n  }\n\n  getAnimationStateCallback() {\n    return this._aniamtionStateCallback;\n  }\n}\n"]}

package/esm/model/interface.d.ts

@@ -33,6 +33,18 @@ export interface IModelRenderOption {
 export interface IEffect {
     [key: string]: (e?: any) => any;
 }
+export interface IUpdateSpecEffects {
+    remake?: boolean;
+    compile?: boolean;
+    render?: boolean;
+    layout?: boolean;
+    data?: boolean;
+    scaleDomain?: boolean;
+    series?: boolean;
+    component?: boolean;
+    animation?: boolean;
+    localOnly?: boolean;
+}
 export interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {
     type: 'group';
     name: string;
@@ -46,6 +58,7 @@ export interface IUpdateSpecResult {
     reSize?: boolean;
     reCompile?: boolean;
     reTransformSpec?: boolean;
+    effects?: IUpdateSpecEffects;
     reAnimate?: boolean;
     changeTheme?: boolean;
     changeBackground?: boolean;

package/esm/model/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet, DataView } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { AnimationStateValues, IMark, IMarkGraphic, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { StringOrNumber } from '../typings/common';\nimport type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';\nimport type { IRect } from '../typings/space';\nimport type { IPoint, CoordinateType } from '../typings/coordinate';\nimport type { StateValueType } from '../typings/spec';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart, IChartSpecInfo, IChartSpecTransformerOption } from '../chart/interface';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\nimport type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';\nimport type { ILayoutPoint, ILayoutRect } from '../typings/layout';\nimport type { ComponentTypeEnum } from '../component/interface';\nimport type { SeriesTypeEnum } from '../series/interface';\nimport type { ITooltipSpec } from '../component/tooltip/interface';\nimport type { TooltipActiveType } from '../typings';\nimport type { IVChart } from '../core/interface';\nimport type { ICompilableData } from '../compile/data/interface';\nimport type { IDimensionData, IDimensionInfo } from '../event/events/dimension/interface';\nimport type { IAxis } from '../component/axis';\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n  reTransformSpec?: boolean;\n  reAnimate?: boolean;\n  changeTheme?: boolean;\n  changeBackground?: boolean;\n}\n\nexport interface IUpdateDataResult {\n  reAnimate?: boolean;\n}\n\nexport interface IModel extends ICompilable {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  coordinate?: CoordinateType;\n\n  // 布局\n  layout?: ILayoutItem;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  /** updateSpec 或者切换主题后，根据新 spec 执行的初始化过程 */\n  reInit: (spec?: any) => void;\n  beforeRelease: () => void;\n\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onDataUpdate: () => void;\n  onBeforeRender: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n  getSpecPath: () => Array<string | number>;\n\n  //布局周期\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect) => void;\n  onLayoutEnd: () => void;\n\n  getColorScheme: () => IThemeColorScheme | undefined;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any) => void;\n\n  getSpecInfo: () => IModelSpecInfo;\n\n  updateAnimateStateCallback: (callback: (graphic: IMarkGraphic) => AnimationStateValues) => void;\n  getAnimationStateCallback: () => (graphic: IMarkGraphic) => AnimationStateValues;\n}\n\nexport interface ILayoutModel extends IModel {\n  // 布局相关\n  getLayoutStartPoint: () => IPoint;\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  getLayoutRect: () => ILayoutRect;\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;\n\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;\n\n  //布局周期\n  afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  type: string;\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: IVChart;\n  regionIndexes?: Array<number>;\n  specKey?: string;\n  specPath?: Array<string | number>;\n  specInfoPath?: Array<string | number>;\n\n  getTheme?: (...keys: string[]) => any;\n  getSpecInfo?: () => IChartSpecInfo;\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n  getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;\n\n  globalScale: IGlobalScale;\n  animation?: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n\n  /**\n   * 是否关闭交互效果\n   */\n  disableTriggerEvent?: boolean;\n\n  /**\n   * 组件内容展示配置\n   * @since 2.0.11\n   */\n  componentShowContent?: {\n    /**\n     * tooltip 是否关闭内容展示\n     * @default false\n     */\n    tooltip?: boolean | Partial<Record<TooltipActiveType, boolean>>;\n    // crosshair 组件是否展示\n    crosshair?: boolean;\n  };\n\n  getDimensionInfo?: (chart: IChart | undefined, pos: ILayoutPoint, isTooltip?: boolean) => IDimensionInfo[] | null;\n  getDimensionInfoByValue?: (axis: IAxis, value: any) => IDimensionInfo | null;\n  getRectByDimensionData?: (dimensionData: IDimensionData, layoutStartPoint: ILayoutPoint) => any;\n\n  dispatchEvent?: (key: string, params?: any) => void;\n}\n\nexport interface IModelSpecInfo<T extends Record<string, unknown> = any> {\n  /** model 具体类型 */\n  type: string | ComponentTypeEnum | SeriesTypeEnum;\n  /** model spec */\n  spec: T;\n  /** 该 spec 在图表 spec 上的路径 */\n  specPath?: Array<string | number>;\n  /** 该 spec 在图表 spec info 上的路径 */\n  specInfoPath?: Array<string | number>;\n  /** model 当前主题 */\n  theme?: any;\n  /** model 对应的 region 索引 */\n  regionIndexes?: number[];\n  /** model 对应的 series 索引 */\n  seriesIndexes?: number[];\n}\n\nexport interface IModelConstructor {\n  readonly builtInTheme?: any;\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n}\n\nexport type ILayoutModelState = {\n  layoutUpdateRank: number;\n  [key: string]: unknown;\n};\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n\nexport type IBaseModelSpecTransformerOption = IChartSpecTransformerOption;\n\nexport interface IBaseModelSpecTransformerResult<T, K> {\n  spec: T;\n  theme: K;\n}\n\nexport interface IBaseModelSpecTransformer {\n  getTheme: (spec: any, chartSpec: any) => any;\n  transformSpec: (\n    spec: any,\n    chartSpec: any,\n    chartSpecInfo?: IChartSpecInfo\n  ) => IBaseModelSpecTransformerResult<any, any>;\n}\n\nexport interface ITooltipHelper {\n  /** tooltip对应spec */\n  spec: ITooltipSpec | undefined;\n\n  /** 实际生效的tooltip activeType */\n  activeType: TooltipActiveType[];\n\n  /** 可以响应mark tooltip或者dimension tooltip的对象 */\n  activeTriggerSet: {\n    mark?: Set<IMark>;\n    group?: Set<IMark>;\n  };\n  /** 不响应tooltip且不会影响已有tooltip的对象 */\n  ignoreTriggerSet: {\n    mark?: Set<IMark>;\n  };\n\n  /** 更新spec */\n  updateTooltipSpec: () => void;\n}\n"]}
+{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet, DataView } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { AnimationStateValues, IMark, IMarkGraphic, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { StringOrNumber } from '../typings/common';\nimport type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';\nimport type { IRect } from '../typings/space';\nimport type { IPoint, CoordinateType } from '../typings/coordinate';\nimport type { StateValueType } from '../typings/spec';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart, IChartSpecInfo, IChartSpecTransformerOption } from '../chart/interface';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\nimport type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';\nimport type { ILayoutPoint, ILayoutRect } from '../typings/layout';\nimport type { ComponentTypeEnum } from '../component/interface';\nimport type { SeriesTypeEnum } from '../series/interface';\nimport type { ITooltipSpec } from '../component/tooltip/interface';\nimport type { TooltipActiveType } from '../typings';\nimport type { IVChart } from '../core/interface';\nimport type { ICompilableData } from '../compile/data/interface';\nimport type { IDimensionData, IDimensionInfo } from '../event/events/dimension/interface';\nimport type { IAxis } from '../component/axis';\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IUpdateSpecEffects {\n  remake?: boolean;\n  compile?: boolean;\n  render?: boolean;\n  layout?: boolean;\n  data?: boolean;\n  scaleDomain?: boolean;\n  series?: boolean;\n  component?: boolean;\n  animation?: boolean;\n  localOnly?: boolean;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n  reTransformSpec?: boolean;\n  effects?: IUpdateSpecEffects;\n  reAnimate?: boolean;\n  changeTheme?: boolean;\n  changeBackground?: boolean;\n}\n\nexport interface IUpdateDataResult {\n  reAnimate?: boolean;\n}\n\nexport interface IModel extends ICompilable {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  coordinate?: CoordinateType;\n\n  // 布局\n  layout?: ILayoutItem;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  /** updateSpec 或者切换主题后，根据新 spec 执行的初始化过程 */\n  reInit: (spec?: any) => void;\n  beforeRelease: () => void;\n\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onDataUpdate: () => void;\n  onBeforeRender: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n  getSpecPath: () => Array<string | number>;\n\n  //布局周期\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect) => void;\n  onLayoutEnd: () => void;\n\n  getColorScheme: () => IThemeColorScheme | undefined;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any) => void;\n\n  getSpecInfo: () => IModelSpecInfo;\n\n  updateAnimateStateCallback: (callback: (graphic: IMarkGraphic) => AnimationStateValues) => void;\n  getAnimationStateCallback: () => (graphic: IMarkGraphic) => AnimationStateValues;\n}\n\nexport interface ILayoutModel extends IModel {\n  // 布局相关\n  getLayoutStartPoint: () => IPoint;\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  getLayoutRect: () => ILayoutRect;\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;\n\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;\n\n  //布局周期\n  afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  type: string;\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: IVChart;\n  regionIndexes?: Array<number>;\n  specKey?: string;\n  specPath?: Array<string | number>;\n  specInfoPath?: Array<string | number>;\n\n  getTheme?: (...keys: string[]) => any;\n  getSpecInfo?: () => IChartSpecInfo;\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n  getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;\n\n  globalScale: IGlobalScale;\n  animation?: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n\n  /**\n   * 是否关闭交互效果\n   */\n  disableTriggerEvent?: boolean;\n\n  /**\n   * 组件内容展示配置\n   * @since 2.0.11\n   */\n  componentShowContent?: {\n    /**\n     * tooltip 是否关闭内容展示\n     * @default false\n     */\n    tooltip?: boolean | Partial<Record<TooltipActiveType, boolean>>;\n    // crosshair 组件是否展示\n    crosshair?: boolean;\n  };\n\n  getDimensionInfo?: (chart: IChart | undefined, pos: ILayoutPoint, isTooltip?: boolean) => IDimensionInfo[] | null;\n  getDimensionInfoByValue?: (axis: IAxis, value: any) => IDimensionInfo | null;\n  getRectByDimensionData?: (dimensionData: IDimensionData, layoutStartPoint: ILayoutPoint) => any;\n\n  dispatchEvent?: (key: string, params?: any) => void;\n}\n\nexport interface IModelSpecInfo<T extends Record<string, unknown> = any> {\n  /** model 具体类型 */\n  type: string | ComponentTypeEnum | SeriesTypeEnum;\n  /** model spec */\n  spec: T;\n  /** 该 spec 在图表 spec 上的路径 */\n  specPath?: Array<string | number>;\n  /** 该 spec 在图表 spec info 上的路径 */\n  specInfoPath?: Array<string | number>;\n  /** model 当前主题 */\n  theme?: any;\n  /** model 对应的 region 索引 */\n  regionIndexes?: number[];\n  /** model 对应的 series 索引 */\n  seriesIndexes?: number[];\n}\n\nexport interface IModelConstructor {\n  readonly builtInTheme?: any;\n  readonly transformerConstructor: new (option: IBaseModelSpecTransformerOption) => IBaseModelSpecTransformer;\n}\n\nexport type ILayoutModelState = {\n  layoutUpdateRank: number;\n  [key: string]: unknown;\n};\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n\nexport type IBaseModelSpecTransformerOption = IChartSpecTransformerOption;\n\nexport interface IBaseModelSpecTransformerResult<T, K> {\n  spec: T;\n  theme: K;\n}\n\nexport interface IBaseModelSpecTransformer {\n  getTheme: (spec: any, chartSpec: any) => any;\n  transformSpec: (\n    spec: any,\n    chartSpec: any,\n    chartSpecInfo?: IChartSpecInfo\n  ) => IBaseModelSpecTransformerResult<any, any>;\n}\n\nexport interface ITooltipHelper {\n  /** tooltip对应spec */\n  spec: ITooltipSpec | undefined;\n\n  /** 实际生效的tooltip activeType */\n  activeType: TooltipActiveType[];\n\n  /** 可以响应mark tooltip或者dimension tooltip的对象 */\n  activeTriggerSet: {\n    mark?: Set<IMark>;\n    group?: Set<IMark>;\n  };\n  /** 不响应tooltip且不会影响已有tooltip的对象 */\n  ignoreTriggerSet: {\n    mark?: Set<IMark>;\n  };\n\n  /** 更新spec */\n  updateTooltipSpec: () => void;\n}\n"]}

package/esm/region/region.d.ts

@@ -39,13 +39,7 @@ export declare class Region<T extends IRegionSpec = IRegionSpec> extends LayoutM
     initMark(): void;
     protected _initBackgroundMarkStyle(): void;
     protected _initForegroundMarkStyle(): void;
-    _compareSpec(spec: T, prevSpec: T): {
-        change: boolean;
-        reMake: boolean;
-        reRender: boolean;
-        reSize: boolean;
-        reCompile: boolean;
-    };
+    _compareSpec(spec: T, prevSpec: T): import("../model/interface").IUpdateSpecResult;
     reInit(spec?: T): void;
     addSeries(s: ISeries): void;
     removeSeries(s: ISeries): void;

package/esm/series/area/area.d.ts

@@ -7,6 +7,7 @@ import { SeriesTypeEnum } from '../interface/type';
 import type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';
 import type { IMark, IAreaMark } from '../../mark/interface';
 import { AreaSeriesSpecTransformer } from './area-transformer';
+import type { ISeriesSpecUpdatePolicy } from '../base/base-series';
 export interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | 'encodeDefined' | '_lineMark' | '_symbolMark' | 'addSamplingCompile' | 'addOverlapCompile' | 'reCompileSampling' | 'initLineLabelMarkStyle'>, CartesianSeries<T> {
 }
 export declare class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {
@@ -18,6 +19,7 @@ export declare class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> ext
     readonly transformerConstructor: typeof AreaSeriesSpecTransformer;
     protected _areaMark: IAreaMark;
     protected _sortDataByAxis: boolean;
+    protected _getSpecUpdatePolicy(): ISeriesSpecUpdatePolicy;
     initMark(): void;
     initMarkStyle(): void;
     initAreaMarkStyle(): void;

package/esm/series/area/area.js

@@ -1,6 +1,6 @@
 import { isArray } from "@visactor/vutils";
 
-import { LineLikeSeriesMixin } from "../mixin/line-mixin";
+import { LINE_LIKE_SERIES_DATA_RELATED_KEYS, LineLikeSeriesMixin } from "../mixin/line-mixin";
 
 import { CartesianSeries } from "../cartesian/cartesian";
 
@@ -49,6 +49,12 @@ export class AreaSeries extends CartesianSeries {
         super(...arguments), this.type = SeriesTypeEnum.area, this.transformerConstructor = AreaSeriesSpecTransformer, 
         this._sortDataByAxis = !1;
     }
+    _getSpecUpdatePolicy() {
+        const policy = super._getSpecUpdatePolicy();
+        return Object.assign(Object.assign({}, policy), {
+            dataRelatedKeys: Object.assign(Object.assign({}, policy.dataRelatedKeys), LINE_LIKE_SERIES_DATA_RELATED_KEYS)
+        });
+    }
     initMark() {
         var _a;
         const seriesMark = null !== (_a = this._spec.seriesMark) && void 0 !== _a ? _a : "area", isAreaMarkVisible = this._isAreaVisible() || this._isLineVisible();

package/esm/series/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isArray } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant/attribute';\nimport type { Datum, InterpolateType } from '../../typings';\nimport { valueInScaleRange } from '../../util/scale';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\nimport { registerLineMark } from '../../mark/line';\nimport { registerAreaMark } from '../../mark/area';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { AreaSeriesTooltipHelper } from './tooltip-helpter';\nimport { areaSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerAreaSeriesAnimation } from './animation';\nimport type { IMark, IAreaMark } from '../../mark/interface';\nimport { AreaSeriesSpecTransformer } from './area-transformer';\nimport { getGroupAnimationParams } from '../util/utils';\nimport { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian';\nimport { STACK_FIELD_END } from '../../constant/data';\nimport { registerSymbolOverlapTransform } from '../../mark/transform/symbol-overlap';\nimport { registerDataSamplingTransform } from '../../mark/transform/data-sampling';\nimport { area } from '../../theme/builtin/common/series/area';\n\nexport interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n      | 'addSamplingCompile'\n      | 'addOverlapCompile'\n      | 'reCompileSampling'\n      | 'initLineLabelMarkStyle'\n    >,\n    CartesianSeries<T> {}\n\nexport class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly builtInTheme: Record<string, IAreaSeriesTheme> = { area };\n  static readonly mark: SeriesMarkMap = areaSeriesMark;\n  static readonly transformerConstructor = AreaSeriesSpecTransformer as any;\n  readonly transformerConstructor = AreaSeriesSpecTransformer;\n\n  protected _areaMark!: IAreaMark;\n  protected _sortDataByAxis: boolean = false;\n\n  initMark(): void {\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    const isAreaMarkVisible = this._isAreaVisible() || this._isLineVisible();\n    // area\n    this._areaMark = this._createMark(\n      AreaSeries.mark.area,\n      {\n        groupKey: this._seriesField,\n        isSeriesMark: isAreaMarkVisible && seriesMark !== 'point'\n      },\n      {\n        morphElementKey: this.getDimensionField()[0]\n      }\n    ) as IAreaMark;\n\n    this.initSymbolMark(seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n    this.initSymbolMarkStyle();\n  }\n\n  initAreaMarkStyle() {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = (this.getSpec().area?.style?.curveType ??\n      this.getSpec().line?.style?.curveType) as InterpolateType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.horizontal\n          ? 'monotoneY'\n          : 'monotoneX'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      const isAreaVisible = this._isAreaVisible();\n      const isLineVisible = this._isLineVisible();\n      if (isAreaVisible || isLineVisible) {\n        areaMark.setVisible(true);\n      } else {\n        areaMark.setVisible(false);\n      }\n\n      if (this._direction === Direction.horizontal) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            y1: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: isAreaVisible ? this.getColorAttribute() : false,\n          stroke: isLineVisible ? this.getColorAttribute() : false\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined.bind(this),\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      if (this.getStack()) {\n        // 在堆叠情况下面积系列需要控制图元层级，https://github.com/VisActor/VChart/issues/3684\n        this.setMarkStyle(\n          areaMark,\n          {\n            zIndex: (datum: Datum) => -datum[STACK_FIELD_END] // 越在堆叠下层，datum[STACK_FIELD_END] 越小,  zIndex越大\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n\n      // change stroke to area stoke = [lineStroke,false,false,false]\n      Object.keys(areaMark.stateStyle).forEach(state => {\n        if (areaMark.stateStyle[state].stroke) {\n          areaMark.setPostProcess(\n            'stroke',\n            result => {\n              return [result, false, false, false];\n            },\n            state\n          );\n        }\n      });\n    }\n  }\n\n  initAnimation() {\n    const areaAnimationParams = { direction: this.direction };\n    const appearPreset = (this._spec.animationAppear as IMarkAnimateSpec<string>)?.preset;\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('line')?.(areaAnimationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('area')?.(areaAnimationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      const animationParams = getGroupAnimationParams(this);\n      this._symbolMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('scaleInOut')?.(),\n          userAnimationConfig(SeriesMarkNameEnum.point, this._spec, this._markAttributeContext),\n          animationParams\n        )\n      );\n    }\n  }\n\n  protected _isAreaVisible() {\n    const areaSpec = this._spec.area || {};\n    return areaSpec.visible !== false && areaSpec.style?.visible !== false;\n  }\n\n  protected _isLineVisible() {\n    const lineSpec = this._spec.line || {};\n    return lineSpec.visible !== false && lineSpec.style?.visible !== false;\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new AreaSeriesTooltipHelper(this);\n    const { group, mark } = this._tooltipHelper.activeTriggerSet;\n    if (this._areaMark) {\n      group.add(this._areaMark);\n    }\n    if (this._lineMark) {\n      group.add(this._lineMark);\n    }\n    if (this._symbolMark) {\n      mark.add(this._symbolMark);\n      group.add(this._symbolMark);\n    }\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    this.encodeDefined(this._areaMark, 'defined');\n  }\n\n  compile(): void {\n    super.compile();\n    this.addSamplingCompile();\n    this.addOverlapCompile();\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  onLayoutEnd(): void {\n    super.onLayoutEnd();\n    this.reCompileSampling();\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      const seriesMarkType = this._spec.seriesMark ?? 'area';\n\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && (!result || seriesMarkType === 'line')) {\n        attribute = 'stroke';\n        result = this._seriesMark?.getAttribute(attribute, datum) ?? undefined;\n      }\n      if (attribute === 'stroke' && isArray(result)) {\n        return result[0];\n      }\n      return result;\n    };\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n\nexport const registerAreaSeries = () => {\n  registerDataSamplingTransform();\n  registerSymbolOverlapTransform();\n  registerLineMark();\n  registerAreaMark();\n  registerSymbolMark();\n  registerAreaSeriesAnimation();\n  registerCartesianBandAxis();\n  registerCartesianLinearAxis();\n  Factory.registerSeries(AreaSeries.type, AreaSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isArray } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { LINE_LIKE_SERIES_DATA_RELATED_KEYS, LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant/attribute';\nimport type { Datum, InterpolateType } from '../../typings';\nimport { valueInScaleRange } from '../../util/scale';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\nimport { registerLineMark } from '../../mark/line';\nimport { registerAreaMark } from '../../mark/area';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { AreaSeriesTooltipHelper } from './tooltip-helpter';\nimport { areaSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerAreaSeriesAnimation } from './animation';\nimport type { IMark, IAreaMark } from '../../mark/interface';\nimport { AreaSeriesSpecTransformer } from './area-transformer';\nimport { getGroupAnimationParams } from '../util/utils';\nimport { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian';\nimport { STACK_FIELD_END } from '../../constant/data';\nimport { registerSymbolOverlapTransform } from '../../mark/transform/symbol-overlap';\nimport { registerDataSamplingTransform } from '../../mark/transform/data-sampling';\nimport { area } from '../../theme/builtin/common/series/area';\nimport type { ISeriesSpecUpdatePolicy } from '../base/base-series';\n\nexport interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n      | 'addSamplingCompile'\n      | 'addOverlapCompile'\n      | 'reCompileSampling'\n      | 'initLineLabelMarkStyle'\n    >,\n    CartesianSeries<T> {}\n\nexport class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly builtInTheme: Record<string, IAreaSeriesTheme> = { area };\n  static readonly mark: SeriesMarkMap = areaSeriesMark;\n  static readonly transformerConstructor = AreaSeriesSpecTransformer as any;\n  readonly transformerConstructor = AreaSeriesSpecTransformer;\n\n  protected _areaMark!: IAreaMark;\n  protected _sortDataByAxis: boolean = false;\n\n  protected _getSpecUpdatePolicy(): ISeriesSpecUpdatePolicy {\n    const policy = super._getSpecUpdatePolicy();\n    return {\n      ...policy,\n      dataRelatedKeys: {\n        ...policy.dataRelatedKeys,\n        ...LINE_LIKE_SERIES_DATA_RELATED_KEYS\n      }\n    };\n  }\n\n  initMark(): void {\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    const isAreaMarkVisible = this._isAreaVisible() || this._isLineVisible();\n    // area\n    this._areaMark = this._createMark(\n      AreaSeries.mark.area,\n      {\n        groupKey: this._seriesField,\n        isSeriesMark: isAreaMarkVisible && seriesMark !== 'point'\n      },\n      {\n        morphElementKey: this.getDimensionField()[0]\n      }\n    ) as IAreaMark;\n\n    this.initSymbolMark(seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n    this.initSymbolMarkStyle();\n  }\n\n  initAreaMarkStyle() {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = (this.getSpec().area?.style?.curveType ??\n      this.getSpec().line?.style?.curveType) as InterpolateType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.horizontal\n          ? 'monotoneY'\n          : 'monotoneX'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      const isAreaVisible = this._isAreaVisible();\n      const isLineVisible = this._isLineVisible();\n      if (isAreaVisible || isLineVisible) {\n        areaMark.setVisible(true);\n      } else {\n        areaMark.setVisible(false);\n      }\n\n      if (this._direction === Direction.horizontal) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            y1: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: isAreaVisible ? this.getColorAttribute() : false,\n          stroke: isLineVisible ? this.getColorAttribute() : false\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined.bind(this),\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      if (this.getStack()) {\n        // 在堆叠情况下面积系列需要控制图元层级，https://github.com/VisActor/VChart/issues/3684\n        this.setMarkStyle(\n          areaMark,\n          {\n            zIndex: (datum: Datum) => -datum[STACK_FIELD_END] // 越在堆叠下层，datum[STACK_FIELD_END] 越小,  zIndex越大\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n\n      // change stroke to area stoke = [lineStroke,false,false,false]\n      Object.keys(areaMark.stateStyle).forEach(state => {\n        if (areaMark.stateStyle[state].stroke) {\n          areaMark.setPostProcess(\n            'stroke',\n            result => {\n              return [result, false, false, false];\n            },\n            state\n          );\n        }\n      });\n    }\n  }\n\n  initAnimation() {\n    const areaAnimationParams = { direction: this.direction };\n    const appearPreset = (this._spec.animationAppear as IMarkAnimateSpec<string>)?.preset;\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('line')?.(areaAnimationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('area')?.(areaAnimationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      const animationParams = getGroupAnimationParams(this);\n      this._symbolMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('scaleInOut')?.(),\n          userAnimationConfig(SeriesMarkNameEnum.point, this._spec, this._markAttributeContext),\n          animationParams\n        )\n      );\n    }\n  }\n\n  protected _isAreaVisible() {\n    const areaSpec = this._spec.area || {};\n    return areaSpec.visible !== false && areaSpec.style?.visible !== false;\n  }\n\n  protected _isLineVisible() {\n    const lineSpec = this._spec.line || {};\n    return lineSpec.visible !== false && lineSpec.style?.visible !== false;\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new AreaSeriesTooltipHelper(this);\n    const { group, mark } = this._tooltipHelper.activeTriggerSet;\n    if (this._areaMark) {\n      group.add(this._areaMark);\n    }\n    if (this._lineMark) {\n      group.add(this._lineMark);\n    }\n    if (this._symbolMark) {\n      mark.add(this._symbolMark);\n      group.add(this._symbolMark);\n    }\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    this.encodeDefined(this._areaMark, 'defined');\n  }\n\n  compile(): void {\n    super.compile();\n    this.addSamplingCompile();\n    this.addOverlapCompile();\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  onLayoutEnd(): void {\n    super.onLayoutEnd();\n    this.reCompileSampling();\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      const seriesMarkType = this._spec.seriesMark ?? 'area';\n\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && (!result || seriesMarkType === 'line')) {\n        attribute = 'stroke';\n        result = this._seriesMark?.getAttribute(attribute, datum) ?? undefined;\n      }\n      if (attribute === 'stroke' && isArray(result)) {\n        return result[0];\n      }\n      return result;\n    };\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n\nexport const registerAreaSeries = () => {\n  registerDataSamplingTransform();\n  registerSymbolOverlapTransform();\n  registerLineMark();\n  registerAreaMark();\n  registerSymbolMark();\n  registerAreaSeriesAnimation();\n  registerCartesianBandAxis();\n  registerCartesianLinearAxis();\n  Factory.registerSeries(AreaSeries.type, AreaSeries);\n};\n"]}

package/esm/series/bar/bar.d.ts

@@ -1,5 +1,6 @@
 import type { IBaseScale } from '@visactor/vscale';
 import { CartesianSeries } from '../cartesian/cartesian';
+import type { ISeriesSpecUpdatePolicy } from '../base/base-series';
 import type { IMark, IRectMark, ITextMark } from '../../mark/interface';
 import type { Datum, DirectionType } from '../../typings';
 import type { IBarSeriesSpec, IBarSeriesTheme } from './interface';
@@ -24,9 +25,11 @@ export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extend
     protected _barMark: IRectMark;
     protected _barBackgroundMark: IRectMark;
     protected _barBackgroundViewData: ICompilableData;
+    protected _getSpecUpdatePolicy(): ISeriesSpecUpdatePolicy;
     initMark(): void;
     protected _initBarBackgroundMark(): void;
     initMarkStyle(): void;
+    protected initRectMarkStyle(): void;
     initLabelMarkStyle(textMark: ITextMark): void;
     protected initTooltip(): void;
     protected _statisticViewData(): void;