@visactor/vchart 1.5.4 → 1.6.0

package/cjs/mark/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/path.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAUhC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,EACZ,IAAI,EAAE,EAAE,GACT,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAXH,4BAYC;AAXiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"path.js","sourcesContent":["import type { IPathMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IPathMark = IMarkRaw<IPathMarkSpec>;\n\nexport class PathMark extends BaseMark<IPathMarkSpec> implements IPathMark {\n  static readonly type = MarkTypeEnum.path;\n  readonly type = PathMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPathMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0,\n      path: ''\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/path.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAUhC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,EACZ,IAAI,EAAE,EAAE,GACT,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAXH,4BAYC;AAXiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"path.js","sourcesContent":["import type { IPathMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IPathMark = IMarkRaw<IPathMarkSpec>;\n\nexport class PathMark extends BaseMark<IPathMarkSpec> implements IPathMark {\n  static readonly type = MarkTypeEnum.path;\n  readonly type = PathMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPathMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0,\n      path: ''\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/polygon/polygon.d.ts

@@ -1,7 +1,7 @@
 import type { IPolygonMarkSpec } from '../../typings/visual';
 import { BasePolygonMark } from './base-polygon';
 import type { IMarkRaw, IMarkStyle } from '../interface';
-import { MarkTypeEnum } from '../interface';
+import { MarkTypeEnum } from '../interface/type';
 export type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;
 export declare class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {
     static readonly type = MarkTypeEnum.polygon;

package/cjs/mark/polygon/polygon.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PolygonMark = void 0;
 
-const base_polygon_1 = require("./base-polygon"), interface_1 = require("../interface");
+const base_polygon_1 = require("./base-polygon"), type_1 = require("../interface/type");
 
 class PolygonMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -17,5 +17,5 @@ class PolygonMark extends base_polygon_1.BasePolygonMark {
     }
 }
 
-exports.PolygonMark = PolygonMark, PolygonMark.type = interface_1.MarkTypeEnum.polygon;
+exports.PolygonMark = PolygonMark, PolygonMark.type = type_1.MarkTypeEnum.polygon;
 //# sourceMappingURL=polygon.js.map

package/cjs/mark/polygon/polygon.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/polygon/polygon.ts"],"names":[],"mappings":";;;AAEA,iDAAiD;AAEjD,4CAA4C;AAI5C,MAAa,WAAY,SAAQ,8BAAiC;IAAlE;;QAEW,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IASnC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,kCAWC;AAViB,gBAAI,GAAG,wBAAY,CAAC,OAAO,CAAC","file":"polygon.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPolygonMarkSpec } from '../../typings/visual';\nimport { BasePolygonMark } from './base-polygon';\nimport type { IMarkRaw, IMarkStyle } from '../interface';\nimport { MarkTypeEnum } from '../interface';\n\nexport type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;\n\nexport class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {\n  static readonly type = MarkTypeEnum.polygon;\n  readonly type = PolygonMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPolygonMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/polygon/polygon.ts"],"names":[],"mappings":";;;AAEA,iDAAiD;AAEjD,4CAAiD;AAIjD,MAAa,WAAY,SAAQ,8BAAiC;IAAlE;;QAEW,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IASnC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,kCAWC;AAViB,gBAAI,GAAG,mBAAY,CAAC,OAAO,CAAC","file":"polygon.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPolygonMarkSpec } from '../../typings/visual';\nimport { BasePolygonMark } from './base-polygon';\nimport type { IMarkRaw, IMarkStyle } from '../interface';\nimport { MarkTypeEnum } from '../interface/type';\n\nexport type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;\n\nexport class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {\n  static readonly type = MarkTypeEnum.polygon;\n  readonly type = PolygonMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPolygonMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/polygon/pyramid-3d.d.ts

@@ -1,6 +1,6 @@
 import type { IPyramid3dMarkSpec } from '../../typings/visual';
 import type { IMarkRaw } from '../interface';
-import { MarkTypeEnum } from '../interface';
+import { MarkTypeEnum } from '../interface/type';
 import { BasePolygonMark } from './base-polygon';
 export type IPyramid3dMark = IMarkRaw<IPyramid3dMarkSpec>;
 export declare class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {

package/cjs/mark/polygon/pyramid-3d.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Pyramid3dMark = void 0;
 
-const interface_1 = require("../interface"), base_polygon_1 = require("./base-polygon");
+const type_1 = require("../interface/type"), base_polygon_1 = require("./base-polygon");
 
 class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -12,5 +12,5 @@ class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     }
 }
 
-exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = interface_1.MarkTypeEnum.pyramid3d;
+exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = type_1.MarkTypeEnum.pyramid3d;
 //# sourceMappingURL=pyramid-3d.js.map

package/cjs/mark/polygon/pyramid-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/polygon/pyramid-3d.ts"],"names":[],"mappings":";;;AAGA,4CAA4C;AAC5C,iDAAiD;AAIjD,MAAa,aAAc,SAAQ,8BAAmC;IAAtE;;QAEW,SAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,CAAC;;AAHD,sCAGC;AAFiB,kBAAI,GAAG,wBAAY,CAAC,SAAS,CAAC","file":"pyramid-3d.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPyramid3dMarkSpec } from '../../typings/visual';\nimport type { IMarkRaw } from '../interface';\nimport { MarkTypeEnum } from '../interface';\nimport { BasePolygonMark } from './base-polygon';\n\nexport type IPyramid3dMark = IMarkRaw<IPyramid3dMarkSpec>;\n\nexport class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {\n  static readonly type = MarkTypeEnum.pyramid3d;\n  readonly type = Pyramid3dMark.type;\n}\n"]}
+{"version":3,"sources":["../src/mark/polygon/pyramid-3d.ts"],"names":[],"mappings":";;;AAGA,4CAAiD;AACjD,iDAAiD;AAIjD,MAAa,aAAc,SAAQ,8BAAmC;IAAtE;;QAEW,SAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,CAAC;;AAHD,sCAGC;AAFiB,kBAAI,GAAG,mBAAY,CAAC,SAAS,CAAC","file":"pyramid-3d.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPyramid3dMarkSpec } from '../../typings/visual';\nimport type { IMarkRaw } from '../interface';\nimport { MarkTypeEnum } from '../interface/type';\nimport { BasePolygonMark } from './base-polygon';\n\nexport type IPyramid3dMark = IMarkRaw<IPyramid3dMarkSpec>;\n\nexport class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {\n  static readonly type = MarkTypeEnum.pyramid3d;\n  readonly type = Pyramid3dMark.type;\n}\n"]}

package/cjs/mark/progress-arc.d.ts

@@ -1,7 +1,7 @@
 import type { StateValueType } from '../typings/spec';
 import type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual';
 import type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import { BaseArcMark } from './arc';
 export type IProgressArcMark = IMarkRaw<IProgressArcMarkSpec>;
 export declare class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> implements IProgressArcMark {

package/cjs/mark/progress-arc.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ProgressArcMark = void 0;
 
-const vutils_1 = require("@visactor/vutils"), interface_1 = require("./interface"), arc_1 = require("./arc");
+const vutils_1 = require("@visactor/vutils"), type_1 = require("./interface/type"), arc_1 = require("./arc");
 
 class ProgressArcMark extends arc_1.BaseArcMark {
     constructor() {
@@ -44,6 +44,6 @@ class ProgressArcMark extends arc_1.BaseArcMark {
     }
 }
 
-exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = interface_1.MarkTypeEnum.arc, 
-ProgressArcMark.constructorType = interface_1.MarkTypeEnum.progressArc;
+exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = type_1.MarkTypeEnum.arc, 
+ProgressArcMark.constructorType = type_1.MarkTypeEnum.progressArc;
 //# sourceMappingURL=progress-arc.js.map

package/cjs/mark/progress-arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/progress-arc.ts"],"names":[],"mappings":"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","file":"progress-arc.js","sourcesContent":["import { isFunction, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { StateValueType } from '../typings/spec';\nimport type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { BaseArcMark } from './arc';\nimport type { IAttributeOpt } from '../compile/mark/interface';\n\nexport type IProgressArcMark = IMarkRaw<IProgressArcMarkSpec>;\n\nexport class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> implements IProgressArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  static readonly constructorType = MarkTypeEnum.progressArc;\n\n  protected _cacheStateStyle: IMarkStateStyle<IProgressArcMarkSpec> = {};\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IProgressArcMarkSpec> = {\n      ...super._getDefaultStyle(),\n      innerPadding: 0,\n      outerPadding: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _filterStyle(\n    style: Partial<IMarkStyle<IProgressArcMarkSpec>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<ConvertToMarkStyleSpec<IProgressArcMarkSpec>> | Partial<IMarkStyle<IProgressArcMarkSpec>> {\n    // 记录 radius 缓存\n    if (isValid(style.innerRadius)) {\n      this.setAttribute(\n        'innerRadius',\n        this._styleConvert<'innerRadius'>(style.innerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n    if (isValid(style.outerRadius)) {\n      this.setAttribute(\n        'outerRadius',\n        this._styleConvert<'innerRadius'>(style.outerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n\n    const innerPadding = style.innerPadding ?? stateStyle[state]?.innerPadding?.style;\n    const outerPadding = style.outerPadding ?? stateStyle[state]?.outerPadding?.style;\n    const innerRadius =\n      style.innerRadius ?? this._cacheStateStyle[state]?.innerRadius?.style ?? stateStyle[state]?.innerRadius?.style;\n    const outerRadius =\n      style.outerRadius ?? this._cacheStateStyle[state]?.outerRadius?.style ?? stateStyle[state]?.outerRadius?.style;\n\n    if (innerRadius === 0 && outerRadius === 0) {\n      return style;\n    }\n\n    // 情况一：本次改动了 padding\n    const paddingModified =\n      (isValid(style.innerPadding) && isValid(innerRadius)) || (isValid(style.outerPadding) && isValid(outerRadius));\n\n    // 情况二：本次改动了 radius，但是 padding 已经提前设置且不为 0\n    const radiusModified = (isValid(style.innerRadius) && innerPadding) || (isValid(style.outerRadius) && outerPadding);\n\n    // 如果触发任意一种情况，则重新计算 radius\n    if (paddingModified || radiusModified) {\n      const newStyle = Object.assign({}, style);\n\n      if (innerPadding && isValid(innerRadius)) {\n        // 将 innerPadding 应用到 innerRadius\n        if (isFunction(innerRadius)) {\n          newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = innerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(innerPadding)\n              ? (innerPadding(item, ctx, opt, source) as number)\n              : (innerPadding as number);\n            return result + padding;\n          };\n        } else {\n          if (isFunction(innerPadding)) {\n            newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = innerPadding(item, ctx, opt, source) as number;\n              return (innerRadius as number) + padding;\n            };\n          } else {\n            newStyle.innerRadius = (innerRadius as number) + (innerPadding as number);\n          }\n        }\n      }\n\n      if (outerPadding && isValid(outerRadius)) {\n        // 将 outerPadding 应用到 outerRadius\n        if (isFunction(outerRadius)) {\n          newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = outerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(outerPadding)\n              ? (outerPadding(item, ctx, opt, source) as number)\n              : (outerPadding as number);\n            return result - padding;\n          };\n        } else {\n          if (isFunction(outerPadding)) {\n            newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = outerPadding(item, ctx, opt, source) as number;\n              return (outerRadius as number) - padding;\n            };\n          } else {\n            newStyle.outerRadius = (outerRadius as number) - (outerPadding as number);\n          }\n        }\n      }\n\n      return newStyle;\n    }\n\n    return style;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/progress-arc.ts"],"names":[],"mappings":"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","file":"progress-arc.js","sourcesContent":["import { isFunction, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { StateValueType } from '../typings/spec';\nimport type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { BaseArcMark } from './arc';\nimport type { IAttributeOpt } from '../compile/mark/interface';\n\nexport type IProgressArcMark = IMarkRaw<IProgressArcMarkSpec>;\n\nexport class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> implements IProgressArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  static readonly constructorType = MarkTypeEnum.progressArc;\n\n  protected _cacheStateStyle: IMarkStateStyle<IProgressArcMarkSpec> = {};\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IProgressArcMarkSpec> = {\n      ...super._getDefaultStyle(),\n      innerPadding: 0,\n      outerPadding: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _filterStyle(\n    style: Partial<IMarkStyle<IProgressArcMarkSpec>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<ConvertToMarkStyleSpec<IProgressArcMarkSpec>> | Partial<IMarkStyle<IProgressArcMarkSpec>> {\n    // 记录 radius 缓存\n    if (isValid(style.innerRadius)) {\n      this.setAttribute(\n        'innerRadius',\n        this._styleConvert<'innerRadius'>(style.innerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n    if (isValid(style.outerRadius)) {\n      this.setAttribute(\n        'outerRadius',\n        this._styleConvert<'innerRadius'>(style.outerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n\n    const innerPadding = style.innerPadding ?? stateStyle[state]?.innerPadding?.style;\n    const outerPadding = style.outerPadding ?? stateStyle[state]?.outerPadding?.style;\n    const innerRadius =\n      style.innerRadius ?? this._cacheStateStyle[state]?.innerRadius?.style ?? stateStyle[state]?.innerRadius?.style;\n    const outerRadius =\n      style.outerRadius ?? this._cacheStateStyle[state]?.outerRadius?.style ?? stateStyle[state]?.outerRadius?.style;\n\n    if (innerRadius === 0 && outerRadius === 0) {\n      return style;\n    }\n\n    // 情况一：本次改动了 padding\n    const paddingModified =\n      (isValid(style.innerPadding) && isValid(innerRadius)) || (isValid(style.outerPadding) && isValid(outerRadius));\n\n    // 情况二：本次改动了 radius，但是 padding 已经提前设置且不为 0\n    const radiusModified = (isValid(style.innerRadius) && innerPadding) || (isValid(style.outerRadius) && outerPadding);\n\n    // 如果触发任意一种情况，则重新计算 radius\n    if (paddingModified || radiusModified) {\n      const newStyle = Object.assign({}, style);\n\n      if (innerPadding && isValid(innerRadius)) {\n        // 将 innerPadding 应用到 innerRadius\n        if (isFunction(innerRadius)) {\n          newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = innerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(innerPadding)\n              ? (innerPadding(item, ctx, opt, source) as number)\n              : (innerPadding as number);\n            return result + padding;\n          };\n        } else {\n          if (isFunction(innerPadding)) {\n            newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = innerPadding(item, ctx, opt, source) as number;\n              return (innerRadius as number) + padding;\n            };\n          } else {\n            newStyle.innerRadius = (innerRadius as number) + (innerPadding as number);\n          }\n        }\n      }\n\n      if (outerPadding && isValid(outerRadius)) {\n        // 将 outerPadding 应用到 outerRadius\n        if (isFunction(outerRadius)) {\n          newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = outerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(outerPadding)\n              ? (outerPadding(item, ctx, opt, source) as number)\n              : (outerPadding as number);\n            return result - padding;\n          };\n        } else {\n          if (isFunction(outerPadding)) {\n            newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = outerPadding(item, ctx, opt, source) as number;\n              return (outerRadius as number) - padding;\n            };\n          } else {\n            newStyle.outerRadius = (outerRadius as number) - (outerPadding as number);\n          }\n        }\n      }\n\n      return newStyle;\n    }\n\n    return style;\n  }\n}\n"]}

package/cjs/mark/rect-3d.d.ts

@@ -1,7 +1,7 @@
 import type { IRect3dMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IRect3dMark = IMarkRaw<IRect3dMarkSpec>;
 export declare class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRect3dMark {
     static readonly type = MarkTypeEnum.rect3d;

package/cjs/mark/rect-3d.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Rect3dMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class Rect3dMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,5 +19,5 @@ class Rect3dMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.Rect3dMark = Rect3dMark, Rect3dMark.type = interface_1.MarkTypeEnum.rect3d;
+exports.Rect3dMark = Rect3dMark, Rect3dMark.type = type_1.MarkTypeEnum.rect3d;
 //# sourceMappingURL=rect-3d.js.map

package/cjs/mark/rect-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rect-3d.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAWlC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,gCAaC;AAZiB,eAAI,GAAG,wBAAY,CAAC,MAAM,CAAC","file":"rect-3d.js","sourcesContent":["import type { IRect3dMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IRect3dMark = IMarkRaw<IRect3dMarkSpec>;\n\nexport class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRect3dMark {\n  static readonly type = MarkTypeEnum.rect3d;\n  readonly type = Rect3dMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRect3dMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      length: 3\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/rect-3d.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAWlC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,gCAaC;AAZiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC","file":"rect-3d.js","sourcesContent":["import type { IRect3dMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IRect3dMark = IMarkRaw<IRect3dMarkSpec>;\n\nexport class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRect3dMark {\n  static readonly type = MarkTypeEnum.rect3d;\n  readonly type = Rect3dMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRect3dMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      length: 3\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/rect.d.ts

@@ -1,7 +1,7 @@
 import type { IRectMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IRectMark = IMarkRaw<IRectMarkSpec>;
 export declare class RectMark extends BaseMark<IRectMarkSpec> implements IRectMark {
     static readonly type = MarkTypeEnum.rect;

package/cjs/mark/rect.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.RectMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class RectMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,5 +19,5 @@ class RectMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RectMark = RectMark, RectMark.type = interface_1.MarkTypeEnum.rect;
+exports.RectMark = RectMark, RectMark.type = type_1.MarkTypeEnum.rect;
 //# sourceMappingURL=rect.js.map

package/cjs/mark/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rect.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAWhC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,4BAaC;AAZiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"rect.js","sourcesContent":["import type { IRectMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IRectMark = IMarkRaw<IRectMarkSpec>;\n\nexport class RectMark extends BaseMark<IRectMarkSpec> implements IRectMark {\n  static readonly type = MarkTypeEnum.rect;\n  readonly type = RectMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRectMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/rect.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAWhC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,4BAaC;AAZiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"rect.js","sourcesContent":["import type { IRectMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IRectMark = IMarkRaw<IRectMarkSpec>;\n\nexport class RectMark extends BaseMark<IRectMarkSpec> implements IRectMark {\n  static readonly type = MarkTypeEnum.rect;\n  readonly type = RectMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRectMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/ripple.d.ts

@@ -1,7 +1,7 @@
 import { BaseMark } from './base/base-mark';
 import type { IRippleMarkSpec } from '../typings/visual';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import type { IGroupMark } from '@visactor/vgrammar-core';
 export type IRippleMark = IMarkRaw<IRippleMarkSpec>;
 export declare class RippleMark extends BaseMark<IRippleMarkSpec> implements IRippleMark {

package/cjs/mark/ripple.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.RippleMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class RippleMark extends base_mark_1.BaseMark {
     constructor() {
@@ -25,5 +25,5 @@ class RippleMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RippleMark = RippleMark, RippleMark.type = interface_1.MarkTypeEnum.ripple;
+exports.RippleMark = RippleMark, RippleMark.type = type_1.MarkTypeEnum.ripple;
 //# sourceMappingURL=ripple.js.map

package/cjs/mark/ripple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/ripple.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAI5C,2CAA2C;AAC3C,2DAA8D;AAM9D,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAuBlC,CAAC;IArBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,IAAA,mCAAmB,GAAE,CAAC;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAxBH,gCAyBC;AAxBiB,eAAI,GAAG,wBAAY,CAAC,MAAM,CAAC","file":"ripple.js","sourcesContent":["import { BaseMark } from './base/base-mark';\nimport type { IRippleMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { registerRippleGlyph } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type IRippleMark = IMarkRaw<IRippleMarkSpec>;\n\nexport class RippleMark extends BaseMark<IRippleMarkSpec> implements IRippleMark {\n  static readonly type = MarkTypeEnum.ripple;\n  readonly type = RippleMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRippleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x: 0,\n      y: 0,\n      ripple: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    registerRippleGlyph();\n\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = 'ripplePoint';\n    this._product = view.glyph(glyphType, group ?? view.rootMark).id(id);\n    this._compiledProductId = id;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/ripple.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAI5C,2CAAgD;AAChD,2DAA8D;AAM9D,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAuBlC,CAAC;IArBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,IAAA,mCAAmB,GAAE,CAAC;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAxBH,gCAyBC;AAxBiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC","file":"ripple.js","sourcesContent":["import { BaseMark } from './base/base-mark';\nimport type { IRippleMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerRippleGlyph } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type IRippleMark = IMarkRaw<IRippleMarkSpec>;\n\nexport class RippleMark extends BaseMark<IRippleMarkSpec> implements IRippleMark {\n  static readonly type = MarkTypeEnum.ripple;\n  readonly type = RippleMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRippleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x: 0,\n      y: 0,\n      ripple: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    registerRippleGlyph();\n\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = 'ripplePoint';\n    this._product = view.glyph(glyphType, group ?? view.rootMark).id(id);\n    this._compiledProductId = id;\n  }\n}\n"]}

package/cjs/mark/rule.d.ts

@@ -1,7 +1,7 @@
 import type { IRuleMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IRuleMark = IMarkRaw<IRuleMarkSpec>;
 export declare class RuleMark extends BaseMark<IRuleMarkSpec> implements IRuleMark {
     static readonly type = MarkTypeEnum.rule;

package/cjs/mark/rule.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.RuleMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class RuleMark extends base_mark_1.BaseMark {
     constructor() {
@@ -18,5 +18,5 @@ class RuleMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RuleMark = RuleMark, RuleMark.type = interface_1.MarkTypeEnum.rule;
+exports.RuleMark = RuleMark, RuleMark.type = type_1.MarkTypeEnum.rule;
 //# sourceMappingURL=rule.js.map

package/cjs/mark/rule.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rule.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,GACN,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"rule.js","sourcesContent":["import type { IRuleMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IRuleMark = IMarkRaw<IRuleMarkSpec>;\n\nexport class RuleMark extends BaseMark<IRuleMarkSpec> implements IRuleMark {\n  static readonly type = MarkTypeEnum.rule;\n  readonly type = RuleMark.type;\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRuleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x1: 0,\n      y1: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/rule.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,GACN,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"rule.js","sourcesContent":["import type { IRuleMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IRuleMark = IMarkRaw<IRuleMarkSpec>;\n\nexport class RuleMark extends BaseMark<IRuleMarkSpec> implements IRuleMark {\n  static readonly type = MarkTypeEnum.rule;\n  readonly type = RuleMark.type;\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRuleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x1: 0,\n      y1: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/symbol.d.ts

@@ -1,7 +1,7 @@
 import type { ISymbolMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;
 export declare class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {
     protected _getDefaultStyle(): IMarkStyle<T>;

package/cjs/mark/symbol.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.SymbolMark = exports.BaseSymbolMark = void 0;
 
-const typings_1 = require("../typings"), base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const typings_1 = require("../typings"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class BaseSymbolMark extends base_mark_1.BaseMark {
     _getDefaultStyle() {
@@ -25,5 +25,5 @@ class SymbolMark extends BaseSymbolMark {
     }
 }
 
-exports.SymbolMark = SymbolMark, SymbolMark.type = interface_1.MarkTypeEnum.symbol;
+exports.SymbolMark = SymbolMark, SymbolMark.type = type_1.MarkTypeEnum.symbol;
 //# sourceMappingURL=symbol.js.map

package/cjs/mark/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,wCAA2C;AAE3C,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,cAA0C,SAAQ,oBAAW;IAC9D,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,uBAAa,CAAC,MAAM,EAChC,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAA6B,CAAC;IACvC,CAAC;CACF;AAXD,wCAWC;AAED,MAAa,UAAW,SAAQ,cAA+B;IAA/D;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAClC,CAAC;;AAHD,gCAGC;AAFiB,eAAI,GAAG,wBAAY,CAAC,MAAM,CAAC","file":"symbol.js","sourcesContent":["import { ShapeTypeEnum } from '../typings';\nimport type { ISymbolMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ISymbolMarkSpec> = {\n      ...super._getDefaultStyle(),\n      size: 1,\n      symbolType: ShapeTypeEnum.circle,\n      fill: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle as IMarkStyle<T>;\n  }\n}\n\nexport class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implements ISymbolMark {\n  static readonly type = MarkTypeEnum.symbol;\n  readonly type = SymbolMark.type;\n}\n"]}
+{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,wCAA2C;AAE3C,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,cAA0C,SAAQ,oBAAW;IAC9D,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,uBAAa,CAAC,MAAM,EAChC,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAA6B,CAAC;IACvC,CAAC;CACF;AAXD,wCAWC;AAED,MAAa,UAAW,SAAQ,cAA+B;IAA/D;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAClC,CAAC;;AAHD,gCAGC;AAFiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC","file":"symbol.js","sourcesContent":["import { ShapeTypeEnum } from '../typings';\nimport type { ISymbolMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ISymbolMarkSpec> = {\n      ...super._getDefaultStyle(),\n      size: 1,\n      symbolType: ShapeTypeEnum.circle,\n      fill: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle as IMarkStyle<T>;\n  }\n}\n\nexport class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implements ISymbolMark {\n  static readonly type = MarkTypeEnum.symbol;\n  readonly type = SymbolMark.type;\n}\n"]}

package/cjs/mark/text.d.ts

@@ -1,7 +1,7 @@
 import type { ITextMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type ITextMark = IMarkRaw<ITextMarkSpec>;
 export declare class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {
     static readonly type = MarkTypeEnum.text;

package/cjs/mark/text.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.TextMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class TextMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,5 +19,5 @@ class TextMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.TextMark = TextMark, TextMark.type = interface_1.MarkTypeEnum.text;
+exports.TextMark = TextMark, TextMark.type = type_1.MarkTypeEnum.text;
 //# sourceMappingURL=text.js.map

package/cjs/mark/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAYhC,CAAC;IAVW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAbH,4BAcC;AAbiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import type { ITextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAYhC,CAAC;IAVW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAbH,4BAcC;AAbiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import type { ITextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/utils/common.d.ts

@@ -1,3 +1,3 @@
-import { MarkTypeEnum } from '../interface';
+import { MarkTypeEnum } from '../interface/type';
 export declare const MultiDatumMark: string[];
 export declare function isMultiDatumMark(type: MarkTypeEnum): boolean;

package/cjs/mark/utils/common.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.isMultiDatumMark = exports.MultiDatumMark = void 0;
 
-const interface_1 = require("../interface");
+const type_1 = require("../interface/type");
 
 function isMultiDatumMark(type) {
     return exports.MultiDatumMark.includes(type);
 }
 
-exports.MultiDatumMark = [ interface_1.MarkTypeEnum.line, interface_1.MarkTypeEnum.area, "trail" ], 
+exports.MultiDatumMark = [ type_1.MarkTypeEnum.line, type_1.MarkTypeEnum.area, "trail" ], 
 exports.isMultiDatumMark = isMultiDatumMark;
 //# sourceMappingURL=common.js.map

package/cjs/mark/utils/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/utils/common.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE/B,QAAA,cAAc,GAAG,CAAC,wBAAY,CAAC,IAAI,EAAE,wBAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAE9E,SAAgB,gBAAgB,CAAC,IAAkB;IACjD,OAAO,sBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAFD,4CAEC","file":"common.js","sourcesContent":["import { MarkTypeEnum } from '../interface';\n\nexport const MultiDatumMark = [MarkTypeEnum.line, MarkTypeEnum.area, 'trail'];\n\nexport function isMultiDatumMark(type: MarkTypeEnum) {\n  return MultiDatumMark.includes(type);\n}\n"]}
+{"version":3,"sources":["../src/mark/utils/common.ts"],"names":[],"mappings":";;;AAAA,4CAAiD;AAEpC,QAAA,cAAc,GAAG,CAAC,mBAAY,CAAC,IAAI,EAAE,mBAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAE9E,SAAgB,gBAAgB,CAAC,IAAkB;IACjD,OAAO,sBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAFD,4CAEC","file":"common.js","sourcesContent":["import { MarkTypeEnum } from '../interface/type';\n\nexport const MultiDatumMark = [MarkTypeEnum.line, MarkTypeEnum.area, 'trail'];\n\nexport function isMultiDatumMark(type: MarkTypeEnum) {\n  return MultiDatumMark.includes(type);\n}\n"]}

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

@@ -5,8 +5,7 @@ import type { CoordinateType } from '../typings/coordinate';
 import type { IMark, IMarkOption, IMarkRaw, IMarkStyle } from '../mark/interface';
 import type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect } from '../typings';
 import type { CompilableData } from '../compile/data/compilable-data';
-import { ModelStateManager } from './model-state-manager';
-import type { IElement, IGroupMark, IMark as IVGrammarMark } from '@visactor/vgrammar-core';
+import type { IGroupMark } from '@visactor/vgrammar-core';
 import { MarkSet } from '../mark/mark-set';
 export declare abstract class BaseModel<T extends IModelSpec> extends LayoutItem<T> implements IModel {
     readonly type: string;
@@ -23,18 +22,12 @@ export declare abstract class BaseModel<T extends IModelSpec> extends LayoutItem
     protected _originalSpec: any;
     protected _option: IModelOption;
     getOption(): IModelOption;
-    protected _sceneNodeMap: Map<string, IElement>;
     protected _marks: MarkSet;
     getMarks(): IMark[];
     getMarkNameMap(): Record<string, IMark>;
     getMarkSet(): MarkSet;
     getMarkInfoList(): IModelMarkInfo[];
     getChart(): import("../chart/interface").IChart;
-    state: ModelStateManager;
-    getState(): {
-        [key: string]: unknown;
-        layoutUpdateRank: number;
-    };
     protected _theme?: any;
     protected _lastLayoutRect: ILayoutRect;
     protected _isLayout: boolean;
@@ -42,7 +35,6 @@ export declare abstract class BaseModel<T extends IModelSpec> extends LayoutItem
     coordinate?: CoordinateType;
     protected _releaseEvent(): void;
     created(): void;
-    updateState(newState: Record<string, unknown>): Promise<any>;
     init(option: IModelInitOption): void;
     afterInit(): void;
     onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void;
@@ -71,7 +63,6 @@ export declare abstract class BaseModel<T extends IModelSpec> extends LayoutItem
     reInit(theme?: any): void;
     protected _initTheme(theme?: any): void;
     protected _getTheme(): any;
-    protected _mergeMarkTheme(): void;
     protected _mergeThemeToSpec(): void;
     protected _getDefaultSpecFromChart(chartSpec: any): Partial<T>;
     protected _shouldMergeThemeToSpec(): boolean;
@@ -86,12 +77,8 @@ export declare abstract class BaseModel<T extends IModelSpec> extends LayoutItem
     protected stateKeyToSignalName(key: string, opt?: string): string;
     compileData(): void;
     compileMarks(group?: string | IGroupMark): void;
-    compileSignal(): void;
-    bindSceneNode(node: IElement): void;
-    getSceneNodes(): IElement[];
-    getSceneNodeMarks(): IVGrammarMark[];
     protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option?: Partial<IMarkOption>): T;
     protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined;
-    getColorScheme(): import("../theme/color-scheme/interface").IThemeColorScheme;
+    getColorScheme(): import("..").IThemeColorScheme;
     protected _getChartLevelTheme(): import("../core/interface").IChartLevelTheme;
 }

package/cjs/model/base-model.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseModel = void 0;
 
-const util_1 = require("../util"), event_1 = require("../event/event"), layout_item_1 = require("./layout-item"), model_state_manager_1 = require("./model-state-manager"), constant_1 = require("../constant"), vutils_1 = require("@visactor/vutils"), factory_1 = require("../core/factory"), mark_set_1 = require("../mark/mark-set"), util_2 = require("../theme/util"), theme_1 = require("../theme");
+const clone_deep_1 = require("../util/spec/clone-deep"), preprocess_1 = require("../util/spec/preprocess"), id_1 = require("../util/id"), merge_spec_1 = require("../util/spec/merge-spec"), event_1 = require("../event/event"), layout_item_1 = require("./layout-item"), constant_1 = require("../constant"), vutils_1 = require("@visactor/vutils"), factory_1 = require("../core/factory"), mark_set_1 = require("../mark/mark-set"), builtin_1 = require("../theme/builtin");
 
 class BaseModel extends layout_item_1.LayoutItem {
     getData() {
@@ -62,21 +62,15 @@ class BaseModel extends layout_item_1.LayoutItem {
     getChart() {
         return this._option.getChart();
     }
-    getState() {
-        return this.state._stateMap;
-    }
     constructor(spec, option) {
         var _a, _b, _c;
         super(option), this.type = "null", this.modelType = "null", this.userId = void 0, 
         this._data = null, this._specIndex = 0, this.specKey = "", this._marks = new mark_set_1.MarkSet, 
-        this._lastLayoutRect = null, this._isLayout = !0, this.id = (0, util_1.createID)(), 
-        this._originalSpec = spec, this._spec = (0, util_1.cloneDeepSpec)(spec), this._transformSpec(), 
+        this._lastLayoutRect = null, this._isLayout = !0, this.id = (0, id_1.createID)(), 
+        this._originalSpec = spec, this._spec = (0, clone_deep_1.cloneDeepSpec)(spec), this._transformSpec(), 
         this.userId = spec.id, this._specIndex = null !== (_a = option.specIndex) && void 0 !== _a ? _a : 0, 
         this.specKey = null !== (_b = option.specKey) && void 0 !== _b ? _b : "", this.effect = {}, 
-        this.event = new event_1.Event(option.eventDispatcher, option.mode), null === (_c = option.map) || void 0 === _c || _c.set(this.id, this), 
-        this._sceneNodeMap = new Map, this.state = new model_state_manager_1.ModelStateManager(Object.assign(Object.assign({}, option), {
-            stateKeyToSignalName: this.stateKeyToSignalName.bind(this)
-        }));
+        this.event = new event_1.Event(option.eventDispatcher, option.mode), null === (_c = option.map) || void 0 === _c || _c.set(this.id, this);
     }
     _releaseEvent() {
         this.event.release();
@@ -84,9 +78,6 @@ class BaseModel extends layout_item_1.LayoutItem {
     created() {
         this._initTheme(), this.setAttrFromSpec();
     }
-    updateState(newState) {
-        return this.state.updateState(newState);
-    }
     init(option) {}
     afterInit() {}
     onLayoutStart(layoutRect, viewRect, ctx) {
@@ -108,11 +99,11 @@ class BaseModel extends layout_item_1.LayoutItem {
     release() {
         var _a;
         this._releaseEvent(), this._originalSpec = {}, this._spec = void 0, this.getMarks().forEach((m => m.release())), 
-        this.state.release(), null === (_a = this._data) || void 0 === _a || _a.release(), 
-        this._data = this._specIndex = this._sceneNodeMap = null, this._marks.clear(), super.release();
+        null === (_a = this._data) || void 0 === _a || _a.release(), this._data = this._specIndex = null, 
+        this._marks.clear(), super.release();
     }
     updateSpec(spec) {
-        this._spec = (0, util_1.cloneDeepSpec)(spec);
+        this._spec = (0, clone_deep_1.cloneDeepSpec)(spec);
         const result = this._compareSpec();
         return this._originalSpec = spec, result.reMake || this.reInit(), result;
     }
@@ -127,29 +118,17 @@ class BaseModel extends layout_item_1.LayoutItem {
         };
     }
     reInit(theme) {
-        this._spec = (0, util_1.cloneDeepSpec)(this._originalSpec), this._transformSpec(), 
+        this._spec = (0, clone_deep_1.cloneDeepSpec)(this._originalSpec), this._transformSpec(), 
         this._initTheme(theme), this.setAttrFromSpec();
     }
     _initTheme(theme) {
-        this._theme = theme || this._getTheme(), this._mergeMarkTheme(), this._mergeThemeToSpec();
+        this._theme = theme || this._getTheme(), this._mergeThemeToSpec();
     }
     _getTheme() {}
-    _mergeMarkTheme() {
-        var _a, _b;
-        const config = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a);
-        if ((0, vutils_1.isNil)(config) || (0, vutils_1.isNil)(this._theme)) return;
-        const markThemeByType = (0, util_2.getThemeFromOption)("mark", this._option), markThemeByName = (0, 
-        util_2.getThemeFromOption)("markByName", this._option);
-        this.getMarkInfoList().forEach((({type: type, name: name}) => {
-            var _a, _b;
-            this._theme[name] = (0, util_1.mergeSpec)({}, null !== (_a = null == markThemeByType ? void 0 : markThemeByType[(0, 
-            vutils_1.array)(type)[0]]) && void 0 !== _a ? _a : {}, null !== (_b = null == markThemeByName ? void 0 : markThemeByName[name]) && void 0 !== _b ? _b : {}, this._theme[name]);
-        }));
-    }
     _mergeThemeToSpec() {
         if (this._shouldMergeThemeToSpec()) {
             const specFromChart = this._getDefaultSpecFromChart(this.getChart().getSpec()), merge = originalSpec => (0, 
-            util_1.mergeSpec)({}, this._theme, this._prepareSpecBeforeMergingTheme(specFromChart), this._prepareSpecBeforeMergingTheme(originalSpec)), baseSpec = this._spec;
+            merge_spec_1.mergeSpec)({}, this._theme, this._prepareSpecBeforeMergingTheme(specFromChart), this._prepareSpecBeforeMergingTheme(originalSpec)), baseSpec = this._spec;
             (0, vutils_1.isArray)(baseSpec) ? this._spec = baseSpec.map((spec => merge(spec))) : this._spec = merge(baseSpec);
         }
         this._prepareSpecAfterMergingTheme();
@@ -165,7 +144,7 @@ class BaseModel extends layout_item_1.LayoutItem {
     }
     _prepareSpecAfterMergingTheme(obj) {
         arguments.length || (obj = this._spec);
-        const newObj = (0, util_1.preprocessSpecOrTheme)("spec", obj, this.getColorScheme(), "series" === this.modelType ? this.type : void 0);
+        const newObj = (0, preprocess_1.preprocessSpecOrTheme)("spec", obj, this.getColorScheme(), "series" === this.modelType ? this._spec : void 0);
         return arguments.length || (this._spec = newObj), newObj;
     }
     setCurrentTheme(noRender) {
@@ -185,10 +164,10 @@ class BaseModel extends layout_item_1.LayoutItem {
         return Object.assign({}, style);
     }
     setMarkStyle(mark, style, state, level) {
-        (0, util_1.isValid)(mark) && (0, util_1.isValid)(style) && mark.setStyle(this._convertMarkStyle(style), state, level);
+        (0, vutils_1.isValid)(mark) && (0, vutils_1.isValid)(style) && mark.setStyle(this._convertMarkStyle(style), state, level);
     }
     initMarkStyleWithSpec(mark, spec, key) {
-        if (!(0, util_1.isValid)(mark) || !(0, util_1.isValid)(spec)) return;
+        if (!(0, vutils_1.isValid)(mark) || !(0, vutils_1.isValid)(spec)) return;
         const {style: style, state: state} = spec, newSpec = Object.assign({}, spec);
         style && (newSpec.style = this._convertMarkStyle(style)), state && (newSpec.state = {}, 
         Object.keys(state).forEach((key => {
@@ -210,19 +189,6 @@ class BaseModel extends layout_item_1.LayoutItem {
             });
         }));
     }
-    compileSignal() {
-        var _a;
-        null === (_a = this.state) || void 0 === _a || _a.compile();
-    }
-    bindSceneNode(node) {
-        this._sceneNodeMap.set(node.mark.id(), node);
-    }
-    getSceneNodes() {
-        return Array.from(this._sceneNodeMap.values());
-    }
-    getSceneNodeMarks() {
-        return this.getSceneNodes().map((node => node.mark));
-    }
     _createMark(markInfo, option = {}) {
         const {type: type, name: name} = markInfo, m = factory_1.Factory.createMark(type, name, Object.assign({
             model: this,
@@ -235,11 +201,11 @@ class BaseModel extends layout_item_1.LayoutItem {
     _getDataIdKey() {}
     getColorScheme() {
         var _a, _b, _c;
-        return (null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : theme_1.defaultChartLevelTheme).colorScheme;
+        return (null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : builtin_1.defaultChartLevelTheme).colorScheme;
     }
     _getChartLevelTheme() {
         var _a, _b, _c;
-        return null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : theme_1.defaultChartLevelTheme;
+        return null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : builtin_1.defaultChartLevelTheme;
     }
 }