@visactor/vchart 0.0.1-alpha.2 → 0.2.1-alpha.0

package/esm/component/axis/utils.d.ts

@@ -1,76 +1,19 @@
 import type { ITheme } from './../../theme/interface';
 import type { IOrientType, IPolarOrientType } from '../../typings';
-import type { ICommonAxisSpec, ILinearAxisSpec } from './interface';
-export declare function getAxisAttributes(spec: any, theme: any): {
-    select: any;
-    hover: any;
-    line: any;
-    label: {
-        visible: any;
-        space: any;
-        inside: any;
-        style: any;
-        formatMethod: (value: any, datum: any, index: number) => any;
-        state: any;
+import type { AxisType, ICommonAxisSpec, ILinearAxisSpec } from './interface';
+export declare const DEFAULT_TITLE_STYLE: {
+    left: {
+        textAlign: string;
+        textBaseline: string;
     };
-    tick: {
-        visible: any;
-        length: any;
-        inside: any;
-        alignWithLabel: any;
-        style: any;
-        state: any;
-    };
-    subTick: {
-        visible: any;
-        length: any;
-        inside: any;
-        count: any;
-        style: any;
-        state: any;
-    };
-    grid: {
-        type: string;
-        visible: any;
-        alternateColor: any;
-        alignWithLabel: any;
-        style: any;
-    };
-    subGrid: {
-        type: string;
-        visible: any;
-        alternateColor: any;
-        style: any;
-    };
-    title: {
-        visible: any;
-        position: any;
-        space: any;
-        autoRotate: boolean;
-        angle: number;
-        textStyle: any;
-        padding: any;
-        shape: {
-            visible: any;
-            space: any;
-            style: any;
-        };
-        background: {
-            visible: any;
-            style: any;
-        };
-        state: {
-            text: any;
-            shape: any;
-            background: any;
-        };
-    };
-    panel: {
-        visible: any;
-        style: any;
-        state: any;
+    right: {
+        textAlign: string;
+        textBaseline: string;
     };
+    radius: {};
+    angle: {};
 };
+export declare function transformAxisLineStyle(lineCfg: any): any;
 export declare function getAxisLabelOffset(axisSpec: ICommonAxisSpec): number;
 export declare function getLinearAxisSpecDomain(axisSpec: ILinearAxisSpec, defaultDomain?: {
     min?: number;
@@ -81,5 +24,5 @@ export declare function getLinearAxisSpecDomain(axisSpec: ILinearAxisSpec, defau
 };
 export declare function isValidCartesianAxis(spec: any): boolean;
 export declare function isValidPolarAxis(spec: any): boolean;
-export declare const getCartesianAxisTheme: (direction: string, orient: IOrientType, theme: ITheme) => any;
-export declare const getPolarAxisTheme: (orient: IPolarOrientType, theme: ITheme) => any;
+export declare const getCartesianAxisTheme: (orient: IOrientType, type: AxisType, theme: ITheme) => any;
+export declare const getPolarAxisTheme: (orient: IPolarOrientType, type: AxisType, theme: ITheme) => any;

package/esm/component/axis/utils.js

@@ -1,12 +1,10 @@
-import { isFunction, merge, get, isNil, degreeToRadian } from "@visactor/vutils";
+import { merge, get } from "@visactor/vutils";
 
-import { Direction } from "../../typings";
-
-import { transformToGraphic, transformComponentStyle, transformStateStyle } from "../../util/style";
+import { transformComponentStyle } from "../../util/style";
 
 import { isXAxis } from "./cartesian/util";
 
-const DEFAULT_TITLE_STYLE = {
+export const DEFAULT_TITLE_STYLE = {
     left: {
         textAlign: "center",
         textBaseline: "bottom"
@@ -19,97 +17,11 @@ const DEFAULT_TITLE_STYLE = {
     angle: {}
 };
 
-function transformAxisLineStyle(lineCfg) {
+export function transformAxisLineStyle(lineCfg) {
     return transformComponentStyle(lineCfg), transformComponentStyle(lineCfg.startSymbol), 
     transformComponentStyle(lineCfg.endSymbol), lineCfg;
 }
 
-export function getAxisAttributes(spec, theme) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    let titleTextStyle, titleAngle = spec.title.angle;
-    return "left" !== spec.orient && "right" !== spec.orient || (null === (_a = spec.title) || void 0 === _a ? void 0 : _a.autoRotate) && isNil(spec.title.angle) && (titleAngle = "left" === spec.orient ? -90 : 90, 
-    titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient]), {
-        select: spec.select,
-        hover: spec.hover,
-        line: transformAxisLineStyle(spec.domainLine),
-        label: {
-            visible: spec.label.visible,
-            space: spec.label.space,
-            inside: spec.label.inside,
-            style: isFunction(spec.label.style) ? (datum, index) => {
-                const style = spec.label.style(datum.rawValue, index, datum);
-                return transformToGraphic(merge({}, theme.label.style, style));
-            } : transformToGraphic(spec.label.style),
-            formatMethod: spec.label.formatMethod ? (value, datum, index) => spec.label.formatMethod(datum.rawValue, datum) : null,
-            state: transformStateStyle(spec.label.state)
-        },
-        tick: {
-            visible: spec.tick.visible,
-            length: spec.tick.tickSize,
-            inside: spec.tick.inside,
-            alignWithLabel: spec.tick.alignWithLabel,
-            style: isFunction(spec.tick.style) ? (datum, index) => {
-                const style = spec.tick.style(datum.rawValue, index, datum);
-                return transformToGraphic(merge({}, theme.tick.style, style));
-            } : transformToGraphic(spec.tick.style),
-            state: transformStateStyle(spec.tick.state)
-        },
-        subTick: {
-            visible: spec.subTick.visible,
-            length: spec.subTick.tickSize,
-            inside: spec.subTick.inside,
-            count: spec.subTick.tickCount,
-            style: transformToGraphic(spec.subTick.style),
-            state: transformStateStyle(spec.subTick.state)
-        },
-        grid: {
-            type: "line",
-            visible: spec.grid.visible,
-            alternateColor: spec.grid.alternateColor,
-            alignWithLabel: spec.grid.alignWithLabel,
-            style: isFunction(spec.grid.style) ? (datum, index) => {
-                var _a;
-                const style = spec.grid.style(null === (_a = datum.datum) || void 0 === _a ? void 0 : _a.rawValue, index, datum.datum);
-                return transformToGraphic(merge({}, theme.grid.style, style));
-            } : transformToGraphic(spec.grid.style)
-        },
-        subGrid: {
-            type: "line",
-            visible: spec.subGrid.visible,
-            alternateColor: spec.subGrid.alternateColor,
-            style: transformToGraphic(spec.subGrid.style)
-        },
-        title: {
-            visible: spec.title.visible,
-            position: spec.title.position,
-            space: spec.title.space,
-            autoRotate: !1,
-            angle: titleAngle ? degreeToRadian(titleAngle) : null,
-            textStyle: merge({}, titleTextStyle, transformToGraphic(spec.title.style)),
-            padding: spec.title.padding,
-            shape: {
-                visible: null === (_b = spec.title.shape) || void 0 === _b ? void 0 : _b.visible,
-                space: null === (_c = spec.title.shape) || void 0 === _c ? void 0 : _c.space,
-                style: transformToGraphic(null === (_d = spec.title.shape) || void 0 === _d ? void 0 : _d.style)
-            },
-            background: {
-                visible: null === (_e = spec.title.background) || void 0 === _e ? void 0 : _e.visible,
-                style: transformToGraphic(null === (_f = spec.title.background) || void 0 === _f ? void 0 : _f.style)
-            },
-            state: {
-                text: transformStateStyle(spec.title.state),
-                shape: transformStateStyle(null === (_g = spec.title.shape) || void 0 === _g ? void 0 : _g.state),
-                background: transformStateStyle(null === (_h = spec.title.background) || void 0 === _h ? void 0 : _h.state)
-            }
-        },
-        panel: {
-            visible: null === (_j = spec.background) || void 0 === _j ? void 0 : _j.visible,
-            style: transformToGraphic(null === (_k = spec.background) || void 0 === _k ? void 0 : _k.style),
-            state: transformStateStyle(null === (_l = spec.background) || void 0 === _l ? void 0 : _l.state)
-        }
-    };
-}
-
 export function getAxisLabelOffset(axisSpec) {
     let labelOffset = 0;
     return get(axisSpec, "tick.visible") && (labelOffset += get(axisSpec, "tick.tickSize")), 
@@ -135,14 +47,15 @@ export function isValidPolarAxis(spec) {
     return "angle" === orient || "radius" === orient;
 }
 
-export const getCartesianAxisTheme = (direction, orient, theme) => {
-    const axisTheme = direction === Direction.horizontal ? isXAxis(orient) ? theme.axisY : theme.axisX : isXAxis(orient) ? theme.axisX : theme.axisY;
-    return merge({}, theme.axis, axisTheme);
+export const getCartesianAxisTheme = (orient, type, theme) => {
+    var _a, _b;
+    const {axisBand: axisBand, axisLinear: axisLinear, axisX: axisX, axisY: axisY, axis: axis} = null !== (_a = theme.component) && void 0 !== _a ? _a : {}, axisTypeTheme = null !== (_b = "band" === type ? axisBand : "linear" === type ? axisLinear : {}) && void 0 !== _b ? _b : {}, axisTheme = isXAxis(orient) ? axisX : axisY;
+    return merge({}, axis, axisTypeTheme, axisTheme);
 };
 
-export const getPolarAxisTheme = (orient, theme) => {
-    let axisTheme = theme.axis;
-    return "angle" === orient ? axisTheme = theme.axisAngle : "radius" === orient && (axisTheme = theme.axisRadius), 
-    merge({}, theme.axis, axisTheme);
+export const getPolarAxisTheme = (orient, type, theme) => {
+    var _a, _b;
+    const {axisBand: axisBand, axisLinear: axisLinear, axisAngle: axisAngle, axisRadius: axisRadius, axis: axis} = null !== (_a = theme.component) && void 0 !== _a ? _a : {}, axisTypeTheme = null !== (_b = "band" === type ? axisBand : "linear" === type ? axisLinear : {}) && void 0 !== _b ? _b : {};
+    return merge({}, axis, axisTypeTheme, "angle" === orient ? axisAngle : axisRadius);
 };
 //# sourceMappingURL=utils.js.map

package/esm/component/axis/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { ITheme } from './../../theme/interface';\nimport { isFunction, merge, get, isNil, degreeToRadian } from '@visactor/vutils';\nimport type { Datum, IOrientType, IPolarOrientType } from '../../typings';\nimport { Direction } from '../../typings';\nimport type { ICommonAxisSpec, ILinearAxisSpec } from './interface';\nimport { transformToGraphic, transformComponentStyle, transformStateStyle } from '../../util/style';\nimport { isXAxis } from './cartesian/util';\n\nconst DEFAULT_TITLE_STYLE = {\n  left: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  right: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  radius: {},\n  angle: {}\n};\n\nfunction transformAxisLineStyle(lineCfg: any) {\n  transformComponentStyle(lineCfg);\n  transformComponentStyle(lineCfg.startSymbol);\n  transformComponentStyle(lineCfg.endSymbol);\n\n  return lineCfg;\n}\n\nexport function getAxisAttributes(spec: any, theme: any) {\n  let titleAngle = spec.title.angle;\n  let titleTextStyle;\n  if (spec.orient === 'left' || spec.orient === 'right') {\n    // 处理纵轴的标题样式\n    if (spec.title?.autoRotate && isNil(spec.title.angle)) {\n      titleAngle = spec.orient === 'left' ? -90 : 90;\n      titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient];\n    }\n  }\n\n  return {\n    select: spec.select,\n    hover: spec.hover,\n    line: transformAxisLineStyle(spec.domainLine),\n    label: {\n      visible: spec.label.visible,\n      space: spec.label.space,\n      inside: spec.label.inside,\n      style: isFunction(spec.label.style)\n        ? (datum: Datum, index: number) => {\n            const style = spec.label.style(datum.rawValue, index, datum);\n\n            return transformToGraphic(merge({}, theme.label.style, style));\n          }\n        : transformToGraphic(spec.label.style),\n      formatMethod: spec.label.formatMethod\n        ? (value: any, datum: any, index: number) => {\n            return spec.label.formatMethod(datum.rawValue, datum);\n          }\n        : null,\n      state: transformStateStyle(spec.label.state)\n    },\n    tick: {\n      visible: spec.tick.visible,\n      length: spec.tick.tickSize,\n      inside: spec.tick.inside,\n      alignWithLabel: spec.tick.alignWithLabel,\n      style: isFunction(spec.tick.style)\n        ? (datum: Datum, index: number) => {\n            const style = spec.tick.style(datum.rawValue, index, datum);\n\n            return transformToGraphic(merge({}, theme.tick.style, style));\n          }\n        : transformToGraphic(spec.tick.style),\n      state: transformStateStyle(spec.tick.state)\n    },\n    subTick: {\n      visible: spec.subTick.visible,\n      length: spec.subTick.tickSize,\n      inside: spec.subTick.inside,\n      count: spec.subTick.tickCount,\n      style: transformToGraphic(spec.subTick.style),\n      state: transformStateStyle(spec.subTick.state)\n    },\n    grid: {\n      type: 'line',\n      visible: spec.grid.visible,\n      alternateColor: spec.grid.alternateColor,\n      alignWithLabel: spec.grid.alignWithLabel,\n      style: isFunction(spec.grid.style)\n        ? (datum: Datum, index: number) => {\n            const style = spec.grid.style(datum.datum?.rawValue, index, datum.datum);\n\n            return transformToGraphic(merge({}, theme.grid.style, style));\n          }\n        : transformToGraphic(spec.grid.style)\n    },\n    subGrid: {\n      type: 'line',\n      visible: spec.subGrid.visible,\n      alternateColor: spec.subGrid.alternateColor,\n      style: transformToGraphic(spec.subGrid.style)\n    },\n    title: {\n      visible: spec.title.visible,\n      position: spec.title.position,\n      space: spec.title.space,\n      autoRotate: false, // 默认不对外提供该配置\n      angle: titleAngle ? degreeToRadian(titleAngle) : null,\n      textStyle: merge({}, titleTextStyle, transformToGraphic(spec.title.style)),\n      padding: spec.title.padding,\n      shape: {\n        visible: spec.title.shape?.visible,\n        space: spec.title.shape?.space,\n        style: transformToGraphic(spec.title.shape?.style)\n      },\n      background: {\n        visible: spec.title.background?.visible,\n        style: transformToGraphic(spec.title.background?.style)\n      },\n      state: {\n        text: transformStateStyle(spec.title.state),\n        shape: transformStateStyle(spec.title.shape?.state),\n        background: transformStateStyle(spec.title.background?.state)\n      }\n    },\n    panel: {\n      visible: spec.background?.visible,\n      style: transformToGraphic(spec.background?.style),\n      state: transformStateStyle(spec.background?.state)\n    }\n  };\n}\n\nexport function getAxisLabelOffset(axisSpec: ICommonAxisSpec) {\n  let labelOffset = 0;\n  if (get(axisSpec, 'tick.visible')) {\n    labelOffset += get(axisSpec, 'tick.tickSize');\n  }\n\n  if (get(axisSpec, 'label.visible')) {\n    labelOffset += get(axisSpec, 'label.space');\n  }\n\n  return labelOffset;\n}\n\nexport function getLinearAxisSpecDomain(\n  axisSpec: ILinearAxisSpec,\n  defaultDomain?: {\n    min?: number;\n    max?: number;\n  }\n) {\n  // 兼容策略\n  return {\n    min: axisSpec.min ?? axisSpec.range?.min ?? defaultDomain?.min,\n    max: axisSpec.max ?? axisSpec.range?.max ?? defaultDomain?.max\n  };\n}\n\nexport function isValidCartesianAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'top' || orient === 'bottom' || orient === 'left' || orient === 'right' || orient === 'z';\n}\n\nexport function isValidPolarAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'angle' || orient === 'radius';\n}\n\nexport const getCartesianAxisTheme = (direction: string, orient: IOrientType, theme: ITheme) => {\n  // 如果配置了 direction 发生了坐标轴转置需要进行处理，保持坐标轴配置一致\n  const axisTheme =\n    direction === Direction.horizontal\n      ? isXAxis(orient)\n        ? theme.axisY\n        : theme.axisX\n      : isXAxis(orient)\n      ? theme.axisX\n      : theme.axisY;\n  return merge({}, theme.axis, axisTheme);\n};\n\nexport const getPolarAxisTheme = (orient: IPolarOrientType, theme: ITheme) => {\n  let axisTheme = theme.axis;\n  if (orient === 'angle') {\n    axisTheme = theme.axisAngle;\n  } else if (orient === 'radius') {\n    axisTheme = theme.axisRadius;\n  }\n  return merge({}, theme.axis, axisTheme);\n};\n"]}
+{"version":3,"sources":["../src/component/axis/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { ITheme } from './../../theme/interface';\nimport { merge, get } from '@visactor/vutils';\nimport type { IOrientType, IPolarOrientType } from '../../typings';\nimport type { AxisType, ICommonAxisSpec, ILinearAxisSpec } from './interface';\nimport { transformComponentStyle } from '../../util/style';\nimport { isXAxis } from './cartesian/util';\n\nexport const DEFAULT_TITLE_STYLE = {\n  left: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  right: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  radius: {},\n  angle: {}\n};\n\nexport function transformAxisLineStyle(lineCfg: any) {\n  transformComponentStyle(lineCfg);\n  transformComponentStyle(lineCfg.startSymbol);\n  transformComponentStyle(lineCfg.endSymbol);\n\n  return lineCfg;\n}\n\nexport function getAxisLabelOffset(axisSpec: ICommonAxisSpec) {\n  let labelOffset = 0;\n  if (get(axisSpec, 'tick.visible')) {\n    labelOffset += get(axisSpec, 'tick.tickSize');\n  }\n\n  if (get(axisSpec, 'label.visible')) {\n    labelOffset += get(axisSpec, 'label.space');\n  }\n\n  return labelOffset;\n}\n\nexport function getLinearAxisSpecDomain(\n  axisSpec: ILinearAxisSpec,\n  defaultDomain?: {\n    min?: number;\n    max?: number;\n  }\n) {\n  // 兼容策略\n  return {\n    min: axisSpec.min ?? axisSpec.range?.min ?? defaultDomain?.min,\n    max: axisSpec.max ?? axisSpec.range?.max ?? defaultDomain?.max\n  };\n}\n\nexport function isValidCartesianAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'top' || orient === 'bottom' || orient === 'left' || orient === 'right' || orient === 'z';\n}\n\nexport function isValidPolarAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'angle' || orient === 'radius';\n}\n\nexport const getCartesianAxisTheme = (orient: IOrientType, type: AxisType, theme: ITheme) => {\n  const { axisBand, axisLinear, axisX, axisY, axis } = theme.component ?? {};\n  const axisTypeTheme = (type === 'band' ? axisBand : type === 'linear' ? axisLinear : {}) ?? {};\n  const axisTheme = isXAxis(orient) ? axisX : axisY;\n  return merge({}, axis, axisTypeTheme, axisTheme);\n};\n\nexport const getPolarAxisTheme = (orient: IPolarOrientType, type: AxisType, theme: ITheme) => {\n  const { axisBand, axisLinear, axisAngle, axisRadius, axis } = theme.component ?? {};\n  const axisTypeTheme = (type === 'band' ? axisBand : type === 'linear' ? axisLinear : {}) ?? {};\n  const axisTheme = orient === 'angle' ? axisAngle : axisRadius;\n  return merge({}, axis, axisTypeTheme, axisTheme);\n};\n"]}

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

@@ -1,11 +1,9 @@
 import type { IGroup, INode } from '@visactor/vrender';
-import type { IMark, IMarkOption } from '../../mark/interface';
 import { BaseModel } from '../../model/base-model';
 import type { IRegion } from '../../region/interface';
 import type { IComponent, IComponentOption } from '../interface';
 import type { BaseEventParams } from '../../event/interface';
 import type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';
-import { MarkSet } from '../../mark/mark-set';
 import type { IGroupMark } from '@visactor/vgrammar';
 import type { IAnimate } from '../../animation/interface';
 export declare abstract class BaseComponent extends BaseModel implements IComponent {
@@ -15,11 +13,8 @@ export declare abstract class BaseComponent extends BaseModel implements ICompon
     protected _option: IComponentOption;
     protected _regions: IRegion[];
     getRegions(): IRegion[];
-    protected _marks: MarkSet;
-    getMarks(): IMark[];
     protected _container: IGroup;
     created(): void;
-    get markOption(): IMarkOption;
     animate?: IAnimate;
     constructor(spec: any, options: IComponentOption);
     abstract changeRegions(regions: IRegion[]): void;

package/esm/component/base/base-component.js

@@ -28,12 +28,10 @@ import { BaseModel } from "../../model/base-model";
 
 import { ComponentPluginService } from "../../plugin/components/plugin-service";
 
-import { get, isArray, merge } from "@visactor/vutils";
+import { isArray, merge } from "@visactor/vutils";
 
 import { getComponentThemeFromGlobalTheme } from "./util";
 
-import { MarkSet } from "../../mark/mark-set";
-
 import { Event_Source_Type } from "../../constant";
 
 import { AnimateManager } from "../../animation/animate-manager";
@@ -42,24 +40,12 @@ export class BaseComponent extends BaseModel {
     getRegions() {
         return this._regions;
     }
-    getMarks() {
-        var _a, _b;
-        return null !== (_b = null === (_a = this._marks) || void 0 === _a ? void 0 : _a.getMarks()) && void 0 !== _b ? _b : [];
-    }
     created() {
         super.created(), this.pluginService = new ComponentPluginService(this);
     }
-    get markOption() {
-        return {
-            model: this,
-            map: this._option.map,
-            getCompiler: this.getCompiler,
-            globalScale: this._option.globalScale
-        };
-    }
     constructor(spec, options) {
         super(spec, options), this.name = "component", this.modelType = "component", this._regions = [], 
-        this._marks = new MarkSet, this._delegateEvent = (component, event, type) => {
+        this._delegateEvent = (component, event, type) => {
             var _a, _b;
             this.event.emit(type, {
                 model: this,
@@ -86,7 +72,7 @@ export class BaseComponent extends BaseModel {
     }
     setCurrentTheme(theme, noRender) {
         return __awaiter(this, void 0, void 0, (function*() {
-            const modifyConfig = () => (this._initTheme(theme), this.reInit(), {
+            const modifyConfig = () => (this.reInit(theme), {
                 change: !0,
                 reMake: !1
             });
@@ -95,15 +81,16 @@ export class BaseComponent extends BaseModel {
     }
     _initTheme(theme) {
         const globalTheme = this._option.getTheme();
-        theme ? super._initTheme(theme) : super._initTheme(getComponentThemeFromGlobalTheme(this.type, globalTheme, this._originalSpec, get(this._option.getChart().getSpec(), "direction"))), 
-        isArray(this._originalSpec) ? this._spec = this._originalSpec.map((spec => merge({}, this._theme, spec))) : this._spec = merge({}, this._theme, this._originalSpec);
+        theme ? super._initTheme(theme) : super._initTheme(getComponentThemeFromGlobalTheme(this.type, globalTheme, this._originalSpec)), 
+        isArray(this._originalSpec) ? this._spec = this._originalSpec.map((spec => merge({}, this._theme, spec))) : this._spec = merge({}, this._theme, this._originalSpec), 
+        this._preprocessSpec();
     }
     getContainer() {
         return this._container || (this._container = this._option.globalInstance.getStage().find((node => "root" === node.name), !0)), 
         this._container;
     }
     release() {
-        super.release(), this.clear(), this._marks.clear();
+        super.release(), this.clear();
     }
     clear() {
         this._container = null;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/base-component.ts"],"names":[],"mappings":"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","file":"base-component.js","sourcesContent":["import type { IGroup, INode } from '@visactor/vrender';\nimport type { IMark, IMarkOption } from '../../mark/interface';\nimport { BaseModel } from '../../model/base-model';\nimport type { IRegion } from '../../region/interface';\nimport type { ComponentTypeEnum, IComponent, IComponentOption } from '../interface';\nimport type { BaseEventParams } from '../../event/interface';\nimport { ComponentPluginService } from '../../plugin/components/plugin-service';\nimport type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';\nimport { get, isArray, merge } from '@visactor/vutils';\nimport { getComponentThemeFromGlobalTheme } from './util';\nimport { MarkSet } from '../../mark/mark-set';\nimport type { IGroupMark } from '@visactor/vgrammar';\nimport { Event_Source_Type } from '../../constant';\nimport type { IAnimate } from '../../animation/interface';\nimport { AnimateManager } from '../../animation/animate-manager';\n\nexport abstract class BaseComponent extends BaseModel implements IComponent {\n  name: string = 'component';\n  readonly modelType: string = 'component';\n  pluginService?: IComponentPluginService;\n  protected declare _option: IComponentOption;\n\n  protected _regions: IRegion[] = [];\n  getRegions() {\n    return this._regions;\n  }\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n\n  protected _container: IGroup;\n\n  created() {\n    super.created();\n    this.pluginService = new ComponentPluginService(this);\n  }\n\n  get markOption(): IMarkOption {\n    return {\n      model: this,\n      map: this._option.map,\n      // 类型\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale\n    };\n  }\n\n  animate?: IAnimate;\n\n  constructor(spec: any, options: IComponentOption) {\n    super(spec, options);\n    this._regions = options.getRegionsInIndex();\n    this.layoutBindRegionID = this._regions.map(x => x.id);\n    // 创建组件自己的动画管理器\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: options.getCompiler\n      });\n    }\n  }\n\n  abstract changeRegions(regions: IRegion[]): void;\n\n  protected callPlugin(cb: (plugin: IComponentPlugin) => void) {\n    if (this.pluginService) {\n      this.pluginService.getAll().forEach(plugin => cb(plugin));\n    }\n  }\n\n  protected eventPos(markEventParams: BaseEventParams) {\n    return {\n      x: (markEventParams.event as any).viewX - this.getLayoutStartPoint().x,\n      y: (markEventParams.event as any).viewY - this.getLayoutStartPoint().y\n    };\n  }\n\n  async setCurrentTheme(theme: any, noRender?: boolean) {\n    const modifyConfig = () => {\n      this._initTheme(theme);\n      // 重新初始化\n      this.reInit();\n\n      return { change: true, reMake: false };\n    };\n\n    if (noRender) {\n      modifyConfig();\n    } else {\n      await this._option.globalInstance.updateCustomConfigAndRerender(modifyConfig);\n    }\n  }\n\n  protected _initTheme(theme?: any) {\n    const globalTheme = this._option.getTheme();\n\n    if (theme) {\n      super._initTheme(theme);\n    } else {\n      super._initTheme(\n        getComponentThemeFromGlobalTheme(\n          this.type as ComponentTypeEnum,\n          globalTheme,\n          this._originalSpec,\n          get(this._option.getChart().getSpec(), 'direction')\n        )\n      );\n    }\n\n    // 将 theme merge 到 spec 中\n    if (isArray(this._originalSpec)) {\n      this._spec = this._originalSpec.map(spec => merge({}, this._theme, spec));\n    } else {\n      this._spec = merge({}, this._theme, this._originalSpec);\n    }\n  }\n\n  protected getContainer() {\n    if (!this._container) {\n      this._container = this._option.globalInstance.getStage().find(node => node.name === 'root', true);\n    }\n\n    return this._container;\n  }\n\n  release() {\n    super.release();\n    this.clear();\n    this._marks.clear();\n  }\n\n  clear() {\n    this._container = null;\n  }\n\n  compile(): void {\n    this.compileSignal();\n    this.compileMarks();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  // 代理组件事件\n  protected _delegateEvent = (component: INode, event: any, type: string) => {\n    this.event.emit(type, {\n      model: this,\n      node: component,\n      event,\n      item: null,\n      datum: null,\n      source: Event_Source_Type.chart,\n      chart: this._option?.globalInstance?.getChart()\n    });\n  };\n}\n"]}
+{"version":3,"sources":["../src/component/base/base-component.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,MAAM,OAAgB,aAAc,SAAQ,SAAS;IAOnD,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAID,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,aAAa,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAID,YAAY,IAAS,EAAE,OAAyB;QAC9C,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QApBvB,SAAI,GAAW,WAAW,CAAC;QAClB,cAAS,GAAW,WAAW,CAAC;QAI/B,aAAQ,GAAc,EAAE,CAAC;QA8GzB,mBAAc,GAAG,CAAC,SAAgB,EAAE,KAAU,EAAE,IAAY,EAAE,EAAE;;YACxE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;gBACpB,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,SAAS;gBACf,KAAK;gBACL,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,iBAAiB,CAAC,KAAK;gBAC/B,KAAK,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc,0CAAE,QAAQ,EAAE;aAChD,CAAC,CAAC;QACL,CAAC,CAAC;QAxGA,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC5C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC;gBAChC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;IAIS,UAAU,CAAC,EAAsC;QACzD,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3D;IACH,CAAC;IAES,QAAQ,CAAC,eAAgC;QACjD,OAAO;YACL,CAAC,EAAG,eAAe,CAAC,KAAa,CAAC,KAAK,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;YACtE,CAAC,EAAG,eAAe,CAAC,KAAa,CAAC,KAAK,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;SACvE,CAAC;IACJ,CAAC;IAEK,eAAe,CAAC,KAAU,EAAE,QAAkB;;YAClD,MAAM,YAAY,GAAG,GAAG,EAAE;gBAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAEnB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACzC,CAAC,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACZ,YAAY,EAAE,CAAC;aAChB;iBAAM;gBACL,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;aAC/E;QACH,CAAC;KAAA;IAES,UAAU,CAAC,KAAW;QAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAE5C,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACzB;aAAM;YACL,KAAK,CAAC,UAAU,CACd,gCAAgC,CAAC,IAAI,CAAC,IAAyB,EAAE,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,CAClG,CAAC;SACH;QAGD,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;SAC3E;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAES,YAAY;QACpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC;SACnG;QAED,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,YAAY,CAAC,KAA2B;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;YAC1B,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACrB,MAAA,CAAC,CAAC,UAAU,EAAE,0CAAE,SAAS,CAAC;gBACxB,OAAO,EAAE;oBACP,KAAK,EAAE,IAAI;iBACZ;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAcF","file":"base-component.js","sourcesContent":["import type { IGroup, INode } from '@visactor/vrender';\nimport { BaseModel } from '../../model/base-model';\nimport type { IRegion } from '../../region/interface';\nimport type { ComponentTypeEnum, IComponent, IComponentOption } from '../interface';\nimport type { BaseEventParams } from '../../event/interface';\nimport { ComponentPluginService } from '../../plugin/components/plugin-service';\nimport type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';\nimport { isArray, merge } from '@visactor/vutils';\nimport { getComponentThemeFromGlobalTheme } from './util';\nimport type { IGroupMark } from '@visactor/vgrammar';\nimport { Event_Source_Type } from '../../constant';\nimport type { IAnimate } from '../../animation/interface';\nimport { AnimateManager } from '../../animation/animate-manager';\n\nexport abstract class BaseComponent extends BaseModel implements IComponent {\n  name: string = 'component';\n  readonly modelType: string = 'component';\n  pluginService?: IComponentPluginService;\n  protected declare _option: IComponentOption;\n\n  protected _regions: IRegion[] = [];\n  getRegions() {\n    return this._regions;\n  }\n\n  protected _container: IGroup;\n\n  created() {\n    super.created();\n    this.pluginService = new ComponentPluginService(this);\n  }\n\n  animate?: IAnimate;\n\n  constructor(spec: any, options: IComponentOption) {\n    super(spec, options);\n    this._regions = options.getRegionsInIndex();\n    this.layoutBindRegionID = this._regions.map(x => x.id);\n    // 创建组件自己的动画管理器\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: options.getCompiler\n      });\n    }\n  }\n\n  abstract changeRegions(regions: IRegion[]): void;\n\n  protected callPlugin(cb: (plugin: IComponentPlugin) => void) {\n    if (this.pluginService) {\n      this.pluginService.getAll().forEach(plugin => cb(plugin));\n    }\n  }\n\n  protected eventPos(markEventParams: BaseEventParams) {\n    return {\n      x: (markEventParams.event as any).viewX - this.getLayoutStartPoint().x,\n      y: (markEventParams.event as any).viewY - this.getLayoutStartPoint().y\n    };\n  }\n\n  async setCurrentTheme(theme: any, noRender?: boolean) {\n    const modifyConfig = () => {\n      // 重新初始化\n      this.reInit(theme);\n\n      return { change: true, reMake: false };\n    };\n\n    if (noRender) {\n      modifyConfig();\n    } else {\n      await this._option.globalInstance.updateCustomConfigAndRerender(modifyConfig);\n    }\n  }\n\n  protected _initTheme(theme?: any) {\n    const globalTheme = this._option.getTheme();\n\n    if (theme) {\n      super._initTheme(theme);\n    } else {\n      super._initTheme(\n        getComponentThemeFromGlobalTheme(this.type as ComponentTypeEnum, globalTheme, this._originalSpec)\n      );\n    }\n\n    // 将 theme merge 到 spec 中\n    if (isArray(this._originalSpec)) {\n      this._spec = this._originalSpec.map(spec => merge({}, this._theme, spec));\n    } else {\n      this._spec = merge({}, this._theme, this._originalSpec);\n    }\n    this._preprocessSpec();\n  }\n\n  protected getContainer() {\n    if (!this._container) {\n      this._container = this._option.globalInstance.getStage().find(node => node.name === 'root', true);\n    }\n\n    return this._container;\n  }\n\n  release() {\n    super.release();\n    this.clear();\n  }\n\n  clear() {\n    this._container = null;\n  }\n\n  compile(): void {\n    this.compileSignal();\n    this.compileMarks();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  // 代理组件事件\n  protected _delegateEvent = (component: INode, event: any, type: string) => {\n    this.event.emit(type, {\n      model: this,\n      node: component,\n      event,\n      item: null,\n      datum: null,\n      source: Event_Source_Type.chart,\n      chart: this._option?.globalInstance?.getChart()\n    });\n  };\n}\n"]}

package/esm/component/base/util.d.ts

@@ -1,3 +1,3 @@
 import type { ITheme } from '../../theme';
 import { ComponentTypeEnum } from '../interface';
-export declare function getComponentThemeFromGlobalTheme(type: ComponentTypeEnum, theme: ITheme, componentSpec: any, direction: string | undefined): any;
+export declare function getComponentThemeFromGlobalTheme(type: ComponentTypeEnum, theme: ITheme, componentSpec: any): any;

package/esm/component/base/util.js

@@ -6,31 +6,40 @@ import { ComponentTypeEnum } from "../interface";
 
 import { getLayout } from "../legend/util";
 
-export function getComponentThemeFromGlobalTheme(type, theme, componentSpec, direction) {
+export function getComponentThemeFromGlobalTheme(type, theme, componentSpec) {
+    var _a, _b, _c, _d;
     switch (type) {
-      case ComponentTypeEnum.cartesianAxis:
       case ComponentTypeEnum.cartesianBandAxis:
+        return getCartesianAxisTheme(getOrient(componentSpec), "band", theme);
+
       case ComponentTypeEnum.cartesianLinearAxis:
+        return getCartesianAxisTheme(getOrient(componentSpec), "linear", theme);
+
+      case ComponentTypeEnum.cartesianAxis:
       case ComponentTypeEnum.cartesianTimeAxis:
-        return getCartesianAxisTheme(direction, getOrient(componentSpec), theme);
+        return getCartesianAxisTheme(getOrient(componentSpec), void 0, theme);
 
-      case ComponentTypeEnum.polarAxis:
       case ComponentTypeEnum.polarBandAxis:
+        return getPolarAxisTheme(componentSpec.orient, "band", theme);
+
       case ComponentTypeEnum.polarLinearAxis:
-        return getPolarAxisTheme(componentSpec.orient, theme);
+        return getPolarAxisTheme(componentSpec.orient, "linear", theme);
+
+      case ComponentTypeEnum.polarAxis:
+        return getPolarAxisTheme(componentSpec.orient, void 0, theme);
 
       case ComponentTypeEnum.cartesianCrosshair:
       case ComponentTypeEnum.polarCrosshair:
-        return theme.crosshair;
+        return null === (_a = theme.component) || void 0 === _a ? void 0 : _a.crosshair;
 
       case ComponentTypeEnum.colorLegend:
-        return theme.colorLegend[getLayout(componentSpec)];
+        return null === (_b = theme.component) || void 0 === _b ? void 0 : _b.colorLegend[getLayout(componentSpec)];
 
       case ComponentTypeEnum.sizeLegend:
-        return theme.sizeLegend[getLayout(componentSpec)];
+        return null === (_c = theme.component) || void 0 === _c ? void 0 : _c.sizeLegend[getLayout(componentSpec)];
 
       default:
-        return theme[type];
+        return null === (_d = theme.component) || void 0 === _d ? void 0 : _d[type];
     }
 }
 //# sourceMappingURL=util.js.map

package/esm/component/base/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,UAAU,gCAAgC,CAC9C,IAAuB,EACvB,KAAa,EACb,aAAkB,EAClB,SAA6B;IAE7B,QAAQ,IAAI,EAAE;QACZ,KAAK,iBAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,iBAAiB,CAAC,iBAAiB,CAAC;QACzC,KAAK,iBAAiB,CAAC,mBAAmB,CAAC;QAC3C,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,CAAC;QAC3E,KAAK,iBAAiB,CAAC,SAAS,CAAC;QACjC,KAAK,iBAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,iBAAiB,CAAC,eAAe;YACpC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACxD,KAAK,iBAAiB,CAAC,kBAAkB,CAAC;QAC1C,KAAK,iBAAiB,CAAC,cAAc;YACnC,OAAO,KAAK,CAAC,SAAS,CAAC;QACzB,KAAK,iBAAiB,CAAC,WAAW;YAChC,OAAO,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QACrD,KAAK,iBAAiB,CAAC,UAAU;YAC/B,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QACpD;YACE,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;KACtB;AACH,CAAC","file":"util.js","sourcesContent":["import type { ITheme } from '../../theme';\nimport { getOrient } from '../axis/cartesian/util';\nimport { getCartesianAxisTheme, getPolarAxisTheme } from '../axis/utils';\nimport { ComponentTypeEnum } from '../interface';\nimport { getLayout } from '../legend/util';\n\nexport function getComponentThemeFromGlobalTheme(\n  type: ComponentTypeEnum,\n  theme: ITheme,\n  componentSpec: any,\n  direction: string | undefined\n) {\n  switch (type) {\n    case ComponentTypeEnum.cartesianAxis:\n    case ComponentTypeEnum.cartesianBandAxis:\n    case ComponentTypeEnum.cartesianLinearAxis:\n    case ComponentTypeEnum.cartesianTimeAxis:\n      return getCartesianAxisTheme(direction, getOrient(componentSpec), theme);\n    case ComponentTypeEnum.polarAxis:\n    case ComponentTypeEnum.polarBandAxis:\n    case ComponentTypeEnum.polarLinearAxis:\n      return getPolarAxisTheme(componentSpec.orient, theme);\n    case ComponentTypeEnum.cartesianCrosshair:\n    case ComponentTypeEnum.polarCrosshair:\n      return theme.crosshair;\n    case ComponentTypeEnum.colorLegend:\n      return theme.colorLegend[getLayout(componentSpec)];\n    case ComponentTypeEnum.sizeLegend:\n      return theme.sizeLegend[getLayout(componentSpec)];\n    default:\n      return theme[type];\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/base/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,UAAU,gCAAgC,CAAC,IAAuB,EAAE,KAAa,EAAE,aAAkB;;IACzG,QAAQ,IAAI,EAAE;QACZ,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACxE,KAAK,iBAAiB,CAAC,mBAAmB;YACxC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC1E,KAAK,iBAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAC3E,KAAK,iBAAiB,CAAC,aAAa;YAClC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAChE,KAAK,iBAAiB,CAAC,eAAe;YACpC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAClE,KAAK,iBAAiB,CAAC,SAAS;YAC9B,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACnE,KAAK,iBAAiB,CAAC,kBAAkB,CAAC;QAC1C,KAAK,iBAAiB,CAAC,cAAc;YACnC,OAAO,MAAA,KAAK,CAAC,SAAS,0CAAE,SAAS,CAAC;QACpC,KAAK,iBAAiB,CAAC,WAAW;YAChC,OAAO,MAAA,KAAK,CAAC,SAAS,0CAAE,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QAChE,KAAK,iBAAiB,CAAC,UAAU;YAC/B,OAAO,MAAA,KAAK,CAAC,SAAS,0CAAE,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QAC/D;YACE,OAAO,MAAA,KAAK,CAAC,SAAS,0CAAG,IAAI,CAAC,CAAC;KAClC;AACH,CAAC","file":"util.js","sourcesContent":["import type { ITheme } from '../../theme';\nimport { getOrient } from '../axis/cartesian/util';\nimport { getCartesianAxisTheme, getPolarAxisTheme } from '../axis/utils';\nimport { ComponentTypeEnum } from '../interface';\nimport { getLayout } from '../legend/util';\n\nexport function getComponentThemeFromGlobalTheme(type: ComponentTypeEnum, theme: ITheme, componentSpec: any) {\n  switch (type) {\n    case ComponentTypeEnum.cartesianBandAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'band', theme);\n    case ComponentTypeEnum.cartesianLinearAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'linear', theme);\n    case ComponentTypeEnum.cartesianAxis:\n    case ComponentTypeEnum.cartesianTimeAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), undefined, theme);\n    case ComponentTypeEnum.polarBandAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'band', theme);\n    case ComponentTypeEnum.polarLinearAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'linear', theme);\n    case ComponentTypeEnum.polarAxis:\n      return getPolarAxisTheme(componentSpec.orient, undefined, theme);\n    case ComponentTypeEnum.cartesianCrosshair:\n    case ComponentTypeEnum.polarCrosshair:\n      return theme.component?.crosshair;\n    case ComponentTypeEnum.colorLegend:\n      return theme.component?.colorLegend[getLayout(componentSpec)];\n    case ComponentTypeEnum.sizeLegend:\n      return theme.component?.sizeLegend[getLayout(componentSpec)];\n    default:\n      return theme.component?.[type];\n  }\n}\n"]}

package/esm/component/crosshair/base.d.ts

@@ -58,7 +58,6 @@ export declare abstract class BaseCrossHair extends BaseComponent implements ICr
         reSize: boolean;
         reCompile: boolean;
     };
-    reInit(): void;
     protected initEvent(): void;
     private _registerEvent;
     private _releaseEvent;

package/esm/component/crosshair/base.js

@@ -65,9 +65,6 @@ export class BaseCrossHair extends BaseComponent {
         const result = super.updateSpec(spec);
         return result.reRender = !0, result.reMake = !0, result;
     }
-    reInit() {
-        super.reInit();
-    }
     initEvent() {
         const {in: triggerEvent, out: outTriggerEvent} = this.getTriggerEvent();
         isArray(triggerEvent) ? triggerEvent.forEach(((eventName, index) => this._registerEvent(eventName, isArray(outTriggerEvent) ? outTriggerEvent[index] : outTriggerEvent))) : this._registerEvent(triggerEvent, outTriggerEvent);
@@ -181,7 +178,7 @@ export class BaseCrossHair extends BaseComponent {
             maxWidth: null == labelBackground ? void 0 : labelBackground.maxWidth,
             padding: null == labelBackground ? void 0 : labelBackground.padding,
             textStyle: Object.assign(Object.assign({
-                fontSize: 12,
+                fontSize: 14,
                 pickable: !1
             }, labelStyle), {
                 fill: null !== (_d = null == labelStyle ? void 0 : labelStyle.fill) && void 0 !== _d ? _d : "#fff",