@visactor/vchart 1.3.1-test.2 → 1.3.1-test.4

package/cjs/series/map/constant.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.mapSeriesMark = void 0;
+
+const interface_1 = require("../../mark/interface"), constant_1 = require("../base/constant"), common_1 = require("../interface/common");
+
+exports.mapSeriesMark = Object.assign(Object.assign({}, constant_1.baseSeriesMark), {
+    [common_1.SeriesMarkNameEnum.area]: {
+        name: common_1.SeriesMarkNameEnum.area,
+        type: interface_1.MarkTypeEnum.path
+    }
+});
+//# sourceMappingURL=constant.js.map

package/cjs/series/map/constant.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/map/constant.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,+CAAkD;AAClD,gDAA6E;AAEhE,QAAA,aAAa,mCACrB,yBAAc,KACjB,CAAC,2BAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,2BAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,wBAAY,CAAC,IAAI,EAAE,IACrF","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\nimport { baseSeriesMark } from '../base/constant';\nimport { SeriesMarkNameEnum, type SeriesMarkMap } from '../interface/common';\n\nexport const mapSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.area]: { name: SeriesMarkNameEnum.area, type: MarkTypeEnum.path }\n};\n"]}

package/cjs/series/map/geo-source.d.ts

@@ -0,0 +1,20 @@
+import { DataView } from '@visactor/vdataset';
+import type { GeoSourceType } from '../../typings/geo';
+export interface IGeoJsonOption {
+    type: 'geojson';
+    centroid?: boolean;
+    simplify?: boolean;
+    rewind?: boolean | {
+        reverse?: boolean;
+    };
+}
+export interface ITopoJsonOption extends Omit<IGeoJsonOption, 'type'> {
+    type: 'topojson';
+    object: string;
+}
+export type GeoSourceOption = IGeoJsonOption | ITopoJsonOption;
+export declare const geoSourceMap: Map<string, DataView>;
+export declare function registerMapSource(key: string, source: GeoSourceType, option?: GeoSourceOption): void;
+export declare function unregisterMapSource(key: string): void;
+export declare function getMapSource(type: string): DataView;
+export declare function clearMapSource(): void;

package/cjs/series/map/geo-source.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.clearMapSource = exports.getMapSource = exports.unregisterMapSource = exports.registerMapSource = exports.geoSourceMap = void 0;
+
+const vdataset_1 = require("@visactor/vdataset"), util_1 = require("../../util"), register_1 = require("../../data/register"), vutils_1 = require("@visactor/vutils");
+
+let mapDataSet;
+
+function initMapDataSet() {
+    mapDataSet || (mapDataSet = new vdataset_1.DataSet, (0, register_1.registerDataSetInstanceParser)(mapDataSet, "geojson", vdataset_1.geoJSONParser), 
+    (0, register_1.registerDataSetInstanceParser)(mapDataSet, "topojson", vdataset_1.topoJSONParser), 
+    (0, register_1.registerDataSetInstanceTransform)(mapDataSet, "simplify", vdataset_1.simplify));
+}
+
+function registerMapSource(key, source, option = {
+    type: "geojson",
+    centroid: !0
+}) {
+    exports.geoSourceMap.has(key) && (0, util_1.warn)(`map type of '${key}' already exists, will be overwritten.`), 
+    initMapDataSet();
+    const dataView = new vdataset_1.DataView(mapDataSet), options = (0, vutils_1.merge)({}, {
+        centroid: !0,
+        simplify: !1
+    }, option);
+    "topojson" === option.type ? dataView.parse(source, {
+        type: "topojson",
+        options: options
+    }) : dataView.parse(source, {
+        type: "geojson",
+        options: options
+    }), !0 === option.simplify && dataView.transform({
+        type: "simplify"
+    }), exports.geoSourceMap.set(key, dataView);
+}
+
+function unregisterMapSource(key) {
+    exports.geoSourceMap.has(key) ? exports.geoSourceMap.delete(key) : (0, util_1.warn)(`map type of '${key}' does not exists.`);
+}
+
+function getMapSource(type) {
+    return exports.geoSourceMap.get(type);
+}
+
+function clearMapSource() {
+    exports.geoSourceMap.clear(), mapDataSet = null;
+}
+
+exports.geoSourceMap = new Map, exports.registerMapSource = registerMapSource, exports.unregisterMapSource = unregisterMapSource, 
+exports.getMapSource = getMapSource, exports.clearMapSource = clearMapSource;
+//# sourceMappingURL=geo-source.js.map

package/cjs/series/map/geo-source.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/map/geo-source.ts"],"names":[],"mappings":";;;AAAA,iDAAgG;AAChG,qCAAkC;AAElC,kDAAsG;AACtG,6CAAyC;AA4B5B,QAAA,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;AAExD,IAAI,UAA0B,CAAC;AAE/B,SAAS,cAAc;IACrB,IAAI,UAAU,EAAE;QACd,OAAO;KACR;IACD,UAAU,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC3B,IAAA,wCAA6B,EAAC,UAAU,EAAE,SAAS,EAAE,wBAAa,CAAC,CAAC;IACpE,IAAA,wCAA6B,EAAC,UAAU,EAAE,UAAU,EAAE,yBAAc,CAAC,CAAC;IACtE,IAAA,2CAAgC,EAAC,UAAU,EAAE,UAAU,EAAE,mBAAQ,CAAC,CAAC;AACrE,CAAC;AAMD,SAAgB,iBAAiB,CAC/B,GAAW,EACX,MAAqB,EACrB,SAA0B,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;IAE7D,IAAI,oBAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzB,IAAA,WAAI,EAAC,gBAAgB,GAAG,wCAAwC,CAAC,CAAC;KACnE;IACD,cAAc,EAAE,CAAC;IACjB,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,UAAW,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAoB,IAAA,cAAK,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IACxF,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;QAC9B,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,IAAI,EAAE,UAAU;YAChB,OAAO;SACR,CAAC,CAAC;KACJ;SAAM;QACL,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,IAAI,EAAE,SAAS;YACf,OAAO;SACR,CAAC,CAAC;KACJ;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE;QAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;KAC1C;IAED,oBAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC;AA5BD,8CA4BC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,IAAI,CAAC,oBAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC1B,IAAA,WAAI,EAAC,gBAAgB,GAAG,oBAAoB,CAAC,CAAC;QAC9C,OAAO;KACR;IACD,oBAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAND,kDAMC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,oBAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAFD,oCAEC;AAED,SAAgB,cAAc;IAC5B,oBAAY,CAAC,KAAK,EAAE,CAAC;IACrB,UAAU,GAAG,IAAI,CAAC;AACpB,CAAC;AAHD,wCAGC","file":"geo-source.js","sourcesContent":["import { DataSet, DataView, geoJSONParser, simplify, topoJSONParser } from '@visactor/vdataset';\nimport { warn } from '../../util';\nimport type { GeoSourceType } from '../../typings/geo';\nimport { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../../data/register';\nimport { merge } from '@visactor/vutils';\n\nexport interface IGeoJsonOption {\n  type: 'geojson';\n  /** 计算中心点 */\n  /** @default true */\n  centroid?: boolean;\n  /** 地图简化 */\n  /** @default false */\n  simplify?: boolean;\n  /** 逆时针回绕(Multi)LineString或(Multi)Polygon的外部环，内部环顺时针。*/\n  /** @default false */\n  rewind?:\n    | boolean\n    | {\n        /** 启用反向绕行 */\n        /** @default false */\n        reverse?: boolean;\n      };\n}\n\nexport interface ITopoJsonOption extends Omit<IGeoJsonOption, 'type'> {\n  type: 'topojson';\n  object: string;\n}\n\nexport type GeoSourceOption = IGeoJsonOption | ITopoJsonOption;\n\nexport const geoSourceMap = new Map<string, DataView>();\n\nlet mapDataSet: DataSet | null;\n\nfunction initMapDataSet() {\n  if (mapDataSet) {\n    return;\n  }\n  mapDataSet = new DataSet();\n  registerDataSetInstanceParser(mapDataSet, 'geojson', geoJSONParser);\n  registerDataSetInstanceParser(mapDataSet, 'topojson', topoJSONParser);\n  registerDataSetInstanceTransform(mapDataSet, 'simplify', simplify);\n}\n\n/**\n * 1. 这个和mapSeries强绑定，后续可以考虑动态注册API\n * 2. 存成dataView而不是原始数据，是考虑减少parser的开销\n */\nexport function registerMapSource(\n  key: string,\n  source: GeoSourceType,\n  option: GeoSourceOption = { type: 'geojson', centroid: true }\n) {\n  if (geoSourceMap.has(key)) {\n    warn(`map type of '${key}' already exists, will be overwritten.`);\n  }\n  initMapDataSet();\n  const dataView = new DataView(mapDataSet!);\n  const options: GeoSourceOption = merge({}, { centroid: true, simplify: false }, option);\n  if (option.type === 'topojson') {\n    dataView.parse(source, {\n      type: 'topojson',\n      options\n    });\n  } else {\n    dataView.parse(source, {\n      type: 'geojson',\n      options\n    });\n  }\n\n  if (option.simplify === true) {\n    dataView.transform({ type: 'simplify' });\n  }\n\n  geoSourceMap.set(key, dataView);\n}\n\nexport function unregisterMapSource(key: string) {\n  if (!geoSourceMap.has(key)) {\n    warn(`map type of '${key}' does not exists.`);\n    return;\n  }\n  geoSourceMap.delete(key);\n}\n\nexport function getMapSource(type: string) {\n  return geoSourceMap.get(type);\n}\n\nexport function clearMapSource() {\n  geoSourceMap.clear();\n  mapDataSet = null;\n}\n"]}

package/cjs/series/map/interface.d.ts

@@ -0,0 +1,30 @@
+import type { IPathMarkSpec, ITextMarkSpec } from '../../typings/visual';
+import type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common';
+import type { IAnimationSpec } from '../../animation/spec';
+type LineMarks = 'area';
+export interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, 'fadeIn'> {
+    type: 'map';
+    map: string;
+    nameField?: string;
+    valueField?: string;
+    nameProperty?: string;
+    nameMap?: {
+        [key: string]: string;
+    };
+    area?: IMarkSpec<Omit<IPathMarkSpec, 'smoothScale'>>;
+    defaultFillColor?: string;
+    label?: IMarkSpec<ITextMarkSpec> & {
+        offset?: number;
+        position?: string;
+        formatMethod?: (text: string | string[], datum?: any) => string | string[];
+    };
+}
+export interface IMapSeriesTheme {
+    defaultFillColor?: string;
+    label?: Partial<IMarkTheme<ITextMarkSpec> & {
+        offset?: number;
+        position?: string;
+    }>;
+    area?: Partial<IMarkTheme<Omit<IPathMarkSpec, 'smoothScale'>>>;
+}
+export {};

package/cjs/series/map/interface.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+//# sourceMappingURL=interface.js.map

package/cjs/series/map/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/map/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPathMarkSpec, ITextMarkSpec } from '../../typings/visual';\nimport type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common';\nimport type { IAnimationSpec } from '../../animation/spec';\n\ntype LineMarks = 'area';\n\nexport interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, 'fadeIn'> {\n  /**\n   *  系列类型\n   */\n  type: 'map';\n  /**\n   *  地图数据源\n   */\n  map: string;\n  /**\n   *  名称维度\n   */\n  nameField?: string;\n  /**\n   *  值维度\n   */\n  valueField?: string;\n  /**\n   * 名称映射字段\n   * @default 'name'\n   */\n  nameProperty?: string;\n  /**\n   *  名称映射表\n   */\n  nameMap?: { [key: string]: string };\n  /**\n   *  图元配置\n   */\n  area?: IMarkSpec<Omit<IPathMarkSpec, 'smoothScale'>>;\n\n  /** 默认填充颜色 */\n  defaultFillColor?: string;\n\n  /** 标签配置 */\n\n  label?: IMarkSpec<ITextMarkSpec> & {\n    offset?: number;\n    position?: string;\n    formatMethod?: (text: string | string[], datum?: any) => string | string[];\n  };\n}\n\nexport interface IMapSeriesTheme {\n  defaultFillColor?: string;\n  label?: Partial<IMarkTheme<ITextMarkSpec> & { offset?: number; position?: string }>;\n  area?: Partial<IMarkTheme<Omit<IPathMarkSpec, 'smoothScale'>>>;\n}\n"]}

package/cjs/series/map/map.d.ts

@@ -0,0 +1,51 @@
+import { DataView } from '@visactor/vdataset';
+import type { Maybe, StringOrNumber } from '../../typings';
+import { GeoSeries } from '../geo/geo';
+import type { SeriesMarkMap } from '../interface';
+import { SeriesTypeEnum } from '../interface';
+import type { IMapSeriesSpec, IMapSeriesTheme } from './interface';
+import type { PanEventParam, ZoomEventParam } from '../../event/interface';
+export declare class MapSeries<T extends IMapSeriesSpec = IMapSeriesSpec> extends GeoSeries<T> {
+    static readonly type: string;
+    type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
+    map: string;
+    protected _nameMap: {
+        [key: StringOrNumber]: StringOrNumber;
+    };
+    getNameMap(): {
+        [key: string]: StringOrNumber;
+        [key: number]: StringOrNumber;
+    };
+    protected _theme: Maybe<IMapSeriesTheme>;
+    private _areaCache;
+    private _pathMark;
+    private _labelMark;
+    setAttrFromSpec(): void;
+    initData(): void;
+    initMark(): void;
+    initMarkStyle(): void;
+    initAnimation(): void;
+    protected initTooltip(): void;
+    protected getPath(datum: any): string;
+    onEvaluateEnd(): void;
+    getDimensionField(): string[];
+    getMeasureField(): string[];
+    release(): void;
+    updateSpec(spec: any): {
+        change: boolean;
+        reMake: boolean;
+        reMakeData: boolean;
+        reRender: boolean;
+        reSize: boolean;
+        reCompile: boolean;
+    };
+    handleZoom(e: ZoomEventParam): void;
+    handlePan(e: PanEventParam): void;
+    protected _getDatumCenter(datum: any): [number, number];
+    protected _getDatumName(datum: any): string;
+    dataToPositionX(data: any): number;
+    dataToPositionY(data: any): number;
+    viewDataUpdate(d: DataView): void;
+    protected _getDataIdKey(): string;
+}

package/cjs/series/map/map.js

@@ -0,0 +1,196 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.MapSeries = void 0;
+
+const vutils_1 = require("@visactor/vutils"), interface_1 = require("../../mark/interface"), vgrammar_1 = require("@visactor/vgrammar"), vgrammar_projection_1 = require("@visactor/vgrammar-projection"), vdataset_1 = require("@visactor/vdataset"), geo_source_1 = require("./geo-source"), lookup_1 = require("../../data/transforms/lookup"), util_1 = require("../../util"), geo_1 = require("../geo/geo"), map_1 = require("../../data/transforms/map"), copy_data_view_1 = require("../../data/transforms/copy-data-view"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), index_1 = require("../../constant/index"), interface_2 = require("../interface"), series_data_1 = require("../base/series-data"), utils_1 = require("../../animation/utils"), config_1 = require("../../animation/config"), vchart_1 = require("../../core/vchart"), path_1 = require("../../mark/path"), text_1 = require("../../mark/text"), constant_1 = require("./constant");
+
+vchart_1.VChart.useMark([ path_1.PathMark, text_1.TextMark ]), (0, vgrammar_1.registerGrammar)("projection", vgrammar_projection_1.Projection, "projections");
+
+class MapSeries extends geo_1.GeoSeries {
+    constructor() {
+        super(...arguments), this.type = interface_2.SeriesTypeEnum.map, this._areaCache = new Map;
+    }
+    getNameMap() {
+        return this._nameMap;
+    }
+    setAttrFromSpec() {
+        super.setAttrFromSpec(), this.map = this._spec.map, this._nameMap = this._spec.nameMap, 
+        this._nameField = this._spec.nameField, this._valueField = this._spec.valueField, 
+        this._spec.nameProperty && (this._nameProperty = this._spec.nameProperty), this.map || this._option.onError(`map type '${this.map}' is not specified !`), 
+        geo_source_1.geoSourceMap.get(this.map) || this._option.onError(`'${this.map}' data is not registered !`);
+    }
+    initData() {
+        var _a;
+        super.initData(), (0, register_1.registerDataSetInstanceTransform)(this._dataSet, "copyDataView", copy_data_view_1.copyDataView), 
+        (0, register_1.registerDataSetInstanceTransform)(this._dataSet, "map", map_1.map), 
+        (0, register_1.registerDataSetInstanceTransform)(this._dataSet, "lookup", lookup_1.lookup);
+        const features = geo_source_1.geoSourceMap.get(this.map);
+        features || this._option.onError("no valid map data found!");
+        const mapData = new vdataset_1.DataView(this._dataSet);
+        mapData.parse([ features ], {
+            type: "dataview"
+        }).transform({
+            type: "copyDataView",
+            options: {
+                deep: !0
+            }
+        }).transform({
+            type: "map",
+            options: {
+                nameMap: this._nameMap,
+                nameProperty: this._nameProperty
+            }
+        }).transform({
+            type: "lookup",
+            options: {
+                from: () => {
+                    var _a;
+                    return null === (_a = this._data) || void 0 === _a ? void 0 : _a.getLatestData();
+                },
+                key: map_1.DEFAULT_MAP_LOOK_UP_KEY,
+                fields: this._nameField,
+                set: (feature, datum) => {
+                    datum && Object.keys(datum).forEach((key => {
+                        key in feature || (feature[key] = datum[key]);
+                    }));
+                }
+            }
+        }), null === (_a = this._data) || void 0 === _a || _a.getDataView().target.addListener("change", mapData.reRunAllTransform), 
+        this._mapViewData = new series_data_1.SeriesData(this._option, mapData);
+    }
+    initMark() {
+        var _a;
+        this._pathMark = this._createMark(MapSeries.mark.area, {
+            morph: (0, utils_1.shouldDoMorph)(this._spec.animation, this._spec.morph, (0, utils_1.userAnimationConfig)("area", this._spec)),
+            defaultMorphElementKey: this.getDimensionField()[0],
+            groupKey: this.getDimensionField()[0],
+            isSeriesMark: !0,
+            skipBeforeLayouted: !0,
+            dataView: this._mapViewData.getDataView(),
+            dataProductId: this._mapViewData.getProductId()
+        }), (null === (_a = this._spec.label) || void 0 === _a ? void 0 : _a.visible) && (this._labelMark = this._createMark(MapSeries.mark.label, {
+            parent: this.getRegion().getGroupMark(),
+            skipBeforeLayouted: !0,
+            dataView: this._mapViewData.getDataView(),
+            dataProductId: this._mapViewData.getProductId()
+        }));
+    }
+    initMarkStyle() {
+        var _a;
+        const pathMark = this._pathMark;
+        pathMark && (this.setMarkStyle(pathMark, {
+            fill: datum => {
+                var _a, _b, _c, _d;
+                return (0, util_1.isValid)(datum[null !== (_a = this._seriesField) && void 0 !== _a ? _a : index_1.DEFAULT_DATA_SERIES_FIELD]) ? (null !== (_b = this._option.globalScale.getScale("color")) && void 0 !== _b ? _b : this.getDefaultColorScale()).scale(datum[null !== (_c = this._seriesField) && void 0 !== _c ? _c : index_1.DEFAULT_DATA_SERIES_FIELD]) : null === (_d = this._spec) || void 0 === _d ? void 0 : _d.defaultFillColor;
+            },
+            path: this.getPath.bind(this)
+        }, "normal", index_1.AttributeLevel.Series), pathMark.setPostProcess("fill", (result => (0, 
+        util_1.isValid)(result) ? result : this._spec.defaultFillColor)), this.setMarkStyle(pathMark, {
+            smoothScale: !0
+        }, "normal", index_1.AttributeLevel.Built_In), this._trigger.registerMark(pathMark), 
+        null === (_a = this._tooltipHelper) || void 0 === _a || _a.activeTriggerSet.mark.add(pathMark));
+        const labelMark = this._labelMark;
+        labelMark && this.setMarkStyle(labelMark, {
+            text: datum => {
+                var _a, _b;
+                const text = this._getDatumName(datum);
+                return (0, vutils_1.isFunction)(null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.label) || void 0 === _b ? void 0 : _b.formatMethod) ? this._spec.label.formatMethod(text, datum) : text;
+            },
+            x: datum => {
+                var _a;
+                return null === (_a = this.dataToPosition(datum)) || void 0 === _a ? void 0 : _a.x;
+            },
+            y: datum => {
+                var _a;
+                return null === (_a = this.dataToPosition(datum)) || void 0 === _a ? void 0 : _a.y;
+            }
+        });
+    }
+    initAnimation() {
+        this._pathMark.setAnimationConfig((0, utils_1.animationConfig)(config_1.DEFAULT_MARK_ANIMATION.path(), (0, 
+        utils_1.userAnimationConfig)(interface_2.SeriesMarkNameEnum.area, this._spec))), 
+        this._labelMark && this._labelMark.setAnimationConfig((0, utils_1.animationConfig)(config_1.DEFAULT_MARK_ANIMATION.label(), (0, 
+        utils_1.userAnimationConfig)(interface_2.SeriesMarkNameEnum.label, this._spec)));
+    }
+    initTooltip() {
+        this._tooltipHelper = new tooltip_helper_1.MapSeriesTooltipHelper(this);
+    }
+    getPath(datum) {
+        var _a;
+        const area = this._areaCache.get(datum[index_1.DEFAULT_DATA_INDEX]);
+        if (area) return area.shape;
+        const shape = null === (_a = this._coordinateHelper) || void 0 === _a ? void 0 : _a.shape(datum);
+        return this._areaCache.set(datum[index_1.DEFAULT_DATA_INDEX], {
+            shape: shape
+        }), shape;
+    }
+    onEvaluateEnd() {
+        this._mapViewData.updateData();
+    }
+    getDimensionField() {
+        return [ this.nameField ];
+    }
+    getMeasureField() {
+        return [ this.valueField ];
+    }
+    release() {
+        super.release(), this._areaCache.clear(), this._nameMap = {}, this._trigger = this._mapViewData = null;
+    }
+    updateSpec(spec) {
+        const originalSpec = this._originalSpec, {map: map, nameMap: nameMap, valueField: valueField, nameProperty: nameProperty} = originalSpec, result = super.updateSpec(spec);
+        return (null == spec ? void 0 : spec.map) === map && (null == spec ? void 0 : spec.nameMap) === nameMap && (null == spec ? void 0 : spec.valueField) === valueField && (null == spec ? void 0 : spec.nameProperty) === nameProperty || (result.change = !0, 
+        result.reRender = !0, result.reMake = !0), result;
+    }
+    handleZoom(e) {
+        const {scale: scale, scaleCenter: scaleCenter} = e;
+        1 !== scale && this.getMarksWithoutRoot().forEach((mark => {
+            const vGrammarMark = mark.getProduct();
+            if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) return;
+            const elements = vGrammarMark.elements;
+            mark.type === interface_1.MarkTypeEnum.path ? vGrammarMark.group.getGroupGraphicItem().scale(scale, scale, scaleCenter) : elements.forEach((el => {
+                const graphicItem = el.getGraphicItem(), datum = el.getDatum(), newPosition = this.dataToPosition(datum);
+                newPosition && graphicItem && graphicItem.translateTo(newPosition.x, newPosition.y);
+            }));
+        }));
+    }
+    handlePan(e) {
+        const {delta: delta} = e;
+        0 === delta[0] && 0 === delta[1] || this.getMarksWithoutRoot().forEach((mark => {
+            const vGrammarMark = mark.getProduct();
+            if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) return;
+            const elements = vGrammarMark.elements;
+            mark.type === interface_1.MarkTypeEnum.path ? vGrammarMark.group.getGroupGraphicItem().translate(delta[0], delta[1]) : elements.forEach(((el, i) => {
+                const graphicItem = el.getGraphicItem(), datum = el.getDatum(), newPosition = this.dataToPosition(datum);
+                newPosition && graphicItem && graphicItem.translateTo(newPosition.x, newPosition.y);
+            }));
+        }));
+    }
+    _getDatumCenter(datum) {
+        var _a, _b;
+        return (0, util_1.isValidNumber)(datum.centroidX * datum.centroidY) ? [ datum.centroidX, datum.centroidY ] : (null === (_a = datum.properties) || void 0 === _a ? void 0 : _a.center) ? datum.properties.center : (null === (_b = datum.properties) || void 0 === _b ? void 0 : _b.centroid) ? datum.properties.centroid : [ Number.NaN, Number.NaN ];
+    }
+    _getDatumName(datum) {
+        var _a, _b, _c, _d;
+        return datum[this.nameField] ? datum[this.nameField] : (null === (_a = datum.properties) || void 0 === _a ? void 0 : _a[this._nameProperty]) ? (null === (_b = this._spec) || void 0 === _b ? void 0 : _b.nameMap) ? null !== (_c = this._spec.nameMap[datum.properties[this._nameProperty]]) && void 0 !== _c ? _c : "" : null !== (_d = datum.properties[this._nameProperty]) && void 0 !== _d ? _d : "" : "";
+    }
+    dataToPositionX(data) {
+        return this._option.onError("Method not implemented."), 0;
+    }
+    dataToPositionY(data) {
+        return this._option.onError("Method not implemented."), 0;
+    }
+    viewDataUpdate(d) {
+        var _a, _b, _c;
+        super.viewDataUpdate(d), null === (_b = null === (_a = this._mapViewData) || void 0 === _a ? void 0 : _a.getDataView()) || void 0 === _b || _b.reRunAllTransform(), 
+        null === (_c = this._mapViewData) || void 0 === _c || _c.updateData();
+    }
+    _getDataIdKey() {
+        return index_1.DEFAULT_DATA_INDEX;
+    }
+}
+
+exports.MapSeries = MapSeries, MapSeries.type = interface_2.SeriesTypeEnum.map, 
+MapSeries.mark = constant_1.mapSeriesMark;
+//# sourceMappingURL=map.js.map

package/cjs/series/map/map.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/map/map.ts"],"names":[],"mappings":"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","file":"map.js","sourcesContent":["import { isFunction } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { registerGrammar } from '@visactor/vgrammar';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { FeatureData } from '@visactor/vgrammar-projection';\nimport { Projection } from '@visactor/vgrammar-projection';\nimport { DataView } from '@visactor/vdataset';\nimport type { IPathMark } from '../../mark/path';\nimport { geoSourceMap } from './geo-source';\nimport { lookup } from '../../data/transforms/lookup';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport { isValid, isValidNumber } from '../../util';\nimport { GeoSeries } from '../geo/geo';\nimport { DEFAULT_MAP_LOOK_UP_KEY, map } from '../../data/transforms/map';\nimport { copyDataView } from '../../data/transforms/copy-data-view';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { MapSeriesTooltipHelper } from './tooltip-helper';\nimport type { ITextMark } from '../../mark/text';\nimport { AttributeLevel, DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_INDEX } from '../../constant/index';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IMapSeriesSpec, IMapSeriesTheme } from './interface';\nimport { SeriesData } from '../base/series-data';\nimport type { PanEventParam, ZoomEventParam } from '../../event/interface';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { VChart } from '../../core/vchart';\nimport { PathMark } from '../../mark/path';\nimport { TextMark } from '../../mark/text';\nimport { mapSeriesMark } from './constant';\n\nVChart.useMark([PathMark, TextMark]);\n\n// 注册语法元素\nregisterGrammar('projection', Projection, 'projections');\n\nexport class MapSeries<T extends IMapSeriesSpec = IMapSeriesSpec> extends GeoSeries<T> {\n  static readonly type: string = SeriesTypeEnum.map;\n  type = SeriesTypeEnum.map;\n\n  static readonly mark: SeriesMarkMap = mapSeriesMark;\n\n  map!: string;\n\n  protected _nameMap!: { [key: StringOrNumber]: StringOrNumber };\n  getNameMap() {\n    return this._nameMap;\n  }\n\n  protected declare _theme: Maybe<IMapSeriesTheme>;\n\n  private _areaCache: Map<string, { shape: string }> = new Map();\n\n  private _pathMark: IPathMark;\n  private _labelMark: ITextMark;\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.map = this._spec.map;\n    this._nameMap = this._spec.nameMap;\n    this._nameField = this._spec.nameField;\n    this._valueField = this._spec.valueField;\n    this._spec.nameProperty && (this._nameProperty = this._spec.nameProperty);\n    if (!this.map) {\n      this._option.onError(`map type '${this.map}' is not specified !`);\n    }\n\n    if (!geoSourceMap.get(this.map)) {\n      this._option.onError(`'${this.map}' data is not registered !`);\n    }\n  }\n\n  // data\n  initData(): void {\n    super.initData();\n\n    registerDataSetInstanceTransform(this._dataSet, 'copyDataView', copyDataView);\n    registerDataSetInstanceTransform(this._dataSet, 'map', map);\n    registerDataSetInstanceTransform(this._dataSet, 'lookup', lookup);\n\n    // 初始化地图数据\n    const features = geoSourceMap.get(this.map);\n    if (!features) {\n      this._option.onError('no valid map data found!');\n    }\n    const mapData = new DataView(this._dataSet);\n\n    mapData\n      .parse([features], {\n        type: 'dataview'\n      })\n      .transform({ type: 'copyDataView', options: { deep: true } })\n      .transform({\n        type: 'map',\n        options: {\n          nameMap: this._nameMap,\n          nameProperty: this._nameProperty\n        }\n      })\n      .transform({\n        type: 'lookup',\n        options: {\n          from: () => this._data?.getLatestData(),\n          key: DEFAULT_MAP_LOOK_UP_KEY,\n          fields: this._nameField,\n          set: (feature: FeatureData, datum: Datum) => {\n            if (datum) {\n              Object.keys(datum).forEach(key => {\n                if (!(key in feature)) {\n                  feature[key] = datum[key];\n                }\n              });\n            }\n          }\n        }\n      });\n    this._data?.getDataView().target.addListener('change', mapData.reRunAllTransform);\n    this._mapViewData = new SeriesData(this._option, mapData);\n  }\n\n  // mark\n  initMark() {\n    this._pathMark = this._createMark(MapSeries.mark.area, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('area', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      skipBeforeLayouted: true,\n      dataView: this._mapViewData.getDataView(),\n      dataProductId: this._mapViewData.getProductId()\n    }) as IPathMark;\n\n    if (this._spec.label?.visible) {\n      this._labelMark = this._createMark(MapSeries.mark.label, {\n        // map zoom/scale need to be transformed in path.group\n        // so label mark cannot be in the same groupMark\n        parent: this.getRegion().getGroupMark(),\n        skipBeforeLayouted: true,\n        dataView: this._mapViewData.getDataView(),\n        dataProductId: this._mapViewData.getProductId()\n      }) as ITextMark;\n    }\n  }\n\n  initMarkStyle() {\n    const pathMark = this._pathMark;\n    if (pathMark) {\n      this.setMarkStyle(\n        pathMark,\n        {\n          fill: (datum: any) => {\n            if (isValid(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD])) {\n              return (this._option.globalScale.getScale('color') ?? this.getDefaultColorScale()).scale(\n                datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD]\n              );\n            }\n            return this._spec?.defaultFillColor;\n          },\n          path: this.getPath.bind(this)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      pathMark.setPostProcess('fill', result => {\n        if (!isValid(result)) {\n          return this._spec.defaultFillColor;\n        }\n        return result;\n      });\n\n      this.setMarkStyle(\n        pathMark,\n        {\n          smoothScale: true\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(pathMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(pathMark);\n    }\n\n    const labelMark = this._labelMark;\n    if (labelMark) {\n      this.setMarkStyle(labelMark, {\n        text: (datum: Datum) => {\n          const text = this._getDatumName(datum);\n          if (isFunction(this._spec?.label?.formatMethod)) {\n            return this._spec.label.formatMethod(text, datum);\n          }\n          return text;\n        },\n        x: (datum: Datum) => this.dataToPosition(datum)?.x,\n        y: (datum: Datum) => this.dataToPosition(datum)?.y\n      });\n    }\n  }\n\n  initAnimation() {\n    this._pathMark.setAnimationConfig(\n      animationConfig(DEFAULT_MARK_ANIMATION.path(), userAnimationConfig(SeriesMarkNameEnum.area, this._spec))\n    );\n\n    if (this._labelMark) {\n      this._labelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec))\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new MapSeriesTooltipHelper(this);\n  }\n\n  protected getPath(datum: any) {\n    const area = this._areaCache.get(datum[DEFAULT_DATA_INDEX]);\n    if (area) {\n      return area.shape;\n    }\n    const shape = this._coordinateHelper?.shape(datum);\n    this._areaCache.set(datum[DEFAULT_DATA_INDEX], {\n      shape\n    });\n    return shape;\n  }\n\n  // life cycle\n  onEvaluateEnd() {\n    this._mapViewData.updateData();\n  }\n\n  getDimensionField(): string[] {\n    return [this.nameField];\n  }\n\n  getMeasureField(): string[] {\n    return [this.valueField];\n  }\n\n  release() {\n    super.release();\n    this._areaCache.clear();\n    this._nameMap = {};\n    this._trigger = this._mapViewData = null as any;\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { map, nameMap, valueField, nameProperty } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (\n      spec?.map !== map ||\n      spec?.nameMap !== nameMap ||\n      spec?.valueField !== valueField ||\n      spec?.nameProperty !== nameProperty\n    ) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  handleZoom(e: ZoomEventParam) {\n    const { scale, scaleCenter } = e;\n    if (scale === 1) {\n      return;\n    }\n\n    this.getMarksWithoutRoot().forEach(mark => {\n      const vGrammarMark = mark.getProduct();\n\n      if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) {\n        return;\n      }\n      const elements = vGrammarMark.elements;\n\n      if (mark.type === MarkTypeEnum.path) {\n        vGrammarMark.group.getGroupGraphicItem().scale(scale, scale, scaleCenter);\n      } else {\n        // label Mark 的定位，需要通过 dataToPosition 来计算\n        elements.forEach((el: IElement) => {\n          const graphicItem = el.getGraphicItem();\n          const datum = el.getDatum();\n          const newPosition = this.dataToPosition(datum);\n          if (newPosition && graphicItem) {\n            graphicItem.translateTo(newPosition.x, newPosition.y);\n          }\n        });\n      }\n    });\n  }\n\n  handlePan(e: PanEventParam) {\n    const { delta } = e;\n    if (delta[0] === 0 && delta[1] === 0) {\n      return;\n    }\n\n    this.getMarksWithoutRoot().forEach(mark => {\n      const vGrammarMark = mark.getProduct();\n\n      if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) {\n        return;\n      }\n      const elements = vGrammarMark.elements;\n\n      if (mark.type === MarkTypeEnum.path) {\n        vGrammarMark.group.getGroupGraphicItem().translate(delta[0], delta[1]);\n      } else {\n        // label Mark 的定位，需要通过 dataToPosition 来计算\n        elements.forEach((el: IElement, i: number) => {\n          const graphicItem = el.getGraphicItem();\n          const datum = el.getDatum();\n          const newPosition = this.dataToPosition(datum);\n          if (newPosition && graphicItem) {\n            graphicItem.translateTo(newPosition.x, newPosition.y);\n          }\n        });\n      }\n    });\n  }\n\n  protected _getDatumCenter(datum: any): [number, number] {\n    if (isValidNumber(datum.centroidX * datum.centroidY)) {\n      return [datum.centroidX, datum.centroidY];\n    }\n\n    if (datum.properties?.center) {\n      return datum.properties.center;\n    }\n\n    if (datum.properties?.centroid) {\n      return datum.properties.centroid;\n    }\n\n    return [Number.NaN, Number.NaN];\n  }\n\n  protected _getDatumName(datum: any): string {\n    if (datum[this.nameField]) {\n      return datum[this.nameField];\n    }\n    if (datum.properties?.[this._nameProperty]) {\n      if (this._spec?.nameMap) {\n        return this._spec.nameMap[datum.properties[this._nameProperty]] ?? '';\n      }\n      return datum.properties[this._nameProperty] ?? '';\n    }\n    return '';\n  }\n\n  dataToPositionX(data: any): number {\n    this._option.onError('Method not implemented.');\n    return 0;\n  }\n  dataToPositionY(data: any): number {\n    this._option.onError('Method not implemented.');\n    return 0;\n  }\n\n  viewDataUpdate(d: DataView): void {\n    super.viewDataUpdate(d);\n    this._mapViewData?.getDataView()?.reRunAllTransform();\n    this._mapViewData?.updateData();\n  }\n\n  protected _getDataIdKey() {\n    return DEFAULT_DATA_INDEX;\n  }\n}\n"]}

package/cjs/series/map/tooltip-helper.d.ts

@@ -0,0 +1,5 @@
+import type { ISeriesTooltipHelper } from '../interface';
+import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
+export declare class MapSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
+    titleValueCallback: (datum: any) => any;
+}

package/cjs/series/map/tooltip-helper.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.MapSeriesTooltipHelper = void 0;
+
+const tooltip_helper_1 = require("../base/tooltip-helper");
+
+class MapSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHelper {
+    constructor() {
+        super(...arguments), this.titleValueCallback = datum => {
+            var _a, _b;
+            const series = this.series;
+            return null !== (_a = this._getDimensionData(datum)) && void 0 !== _a ? _a : null === (_b = datum.properties) || void 0 === _b ? void 0 : _b[`${series.getNameProperty()}`];
+        };
+    }
+}
+
+exports.MapSeriesTooltipHelper = MapSeriesTooltipHelper;
+//# sourceMappingURL=tooltip-helper.js.map

package/cjs/series/map/tooltip-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/map/tooltip-helper.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AAGjE,MAAa,sBAAuB,SAAQ,wCAAuB;IAAnE;;QACE,uBAAkB,GAAG,CAAC,KAAU,EAAE,EAAE;;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAmB,CAAC;YACxC,OAAO,MAAA,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,mCAAI,MAAA,KAAK,CAAC,UAAU,0CAAG,GAAG,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QAC5F,CAAC,CAAC;IACJ,CAAC;CAAA;AALD,wDAKC","file":"tooltip-helper.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport type { MapSeries } from './map';\n\nexport class MapSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n  titleValueCallback = (datum: any) => {\n    const series = this.series as MapSeries;\n    return this._getDimensionData(datum) ?? datum.properties?.[`${series.getNameProperty()}`];\n  };\n}\n"]}

package/cjs/series/mixin/constant.d.ts

@@ -0,0 +1,2 @@
+import type { SeriesMarkMap } from '../interface';
+export declare const lineLikeSeriesMark: SeriesMarkMap;

package/cjs/series/mixin/constant.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.lineLikeSeriesMark = void 0;
+
+const interface_1 = require("../../mark/interface"), interface_2 = require("../interface");
+
+exports.lineLikeSeriesMark = {
+    [interface_2.SeriesMarkNameEnum.point]: {
+        name: interface_2.SeriesMarkNameEnum.point,
+        type: interface_1.MarkTypeEnum.symbol
+    },
+    [interface_2.SeriesMarkNameEnum.line]: {
+        name: interface_2.SeriesMarkNameEnum.line,
+        type: interface_1.MarkTypeEnum.line
+    }
+};
+//# sourceMappingURL=constant.js.map

package/cjs/series/mixin/constant.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/mixin/constant.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AAGpD,4CAAkD;AAErC,QAAA,kBAAkB,GAAkB;IAC/C,CAAC,8BAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,8BAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE;IACzF,CAAC,8BAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,8BAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,wBAAY,CAAC,IAAI,EAAE;CACtF,CAAC","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum } from '../interface';\n\nexport const lineLikeSeriesMark: SeriesMarkMap = {\n  [SeriesMarkNameEnum.point]: { name: SeriesMarkNameEnum.point, type: MarkTypeEnum.symbol },\n  [SeriesMarkNameEnum.line]: { name: SeriesMarkNameEnum.line, type: MarkTypeEnum.line }\n};\n"]}

package/cjs/series/mixin/line-mixin.d.ts

@@ -0,0 +1,45 @@
+import type { ISeriesOption } from '../interface/common';
+import type { ITrigger } from '../../interaction/interface';
+import type { ISeries } from '../interface/series';
+import type { IMark, IMarkProgressiveConfig } from '../../mark/interface';
+import type { ILineMark } from '../../mark/line';
+import type { ISymbolMark } from '../../mark/symbol';
+import type { ITextMark } from '../../mark/text';
+import type { DirectionType, IInvalidType, InterpolateType, ILineMarkSpec, ISymbolMarkSpec, Maybe, Datum, IMarkTheme } from '../../typings';
+import type { ISeriesMarkInfo, ISeriesMarkInitOption, ISeriesTooltipHelper } from '../interface';
+import type { ILabelSpec } from '../../component/label';
+import { type DimensionEventParams } from '../../event/events/dimension';
+export interface ILineLikeSeriesTheme {
+    line?: Partial<IMarkTheme<ILineMarkSpec>>;
+    point?: Partial<IMarkTheme<ISymbolMarkSpec>> & {
+        visibleInActive?: boolean;
+    };
+    label?: Partial<ILabelSpec>;
+}
+export interface LineLikeSeriesMixin extends ISeries {
+    _spec: any;
+    _option: ISeriesOption;
+    _seriesField: string;
+    _theme: Maybe<ILineLikeSeriesTheme>;
+    _trigger: ITrigger;
+    _tooltipHelper: ISeriesTooltipHelper;
+    _invalidType: IInvalidType;
+    _lineMark: ILineMark;
+    _symbolMark: ISymbolMark;
+    _symbolActiveMark: ISymbolMark;
+    _labelMark: ITextMark;
+    _fieldZ?: string[];
+    _createMark: (markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption) => IMark;
+    _getInvalidDefined: () => boolean;
+    _getInvalidConnectType: () => IInvalidType;
+}
+export declare class LineLikeSeriesMixin {
+    initLineMark(progressive?: IMarkProgressiveConfig, isSeriesMark?: boolean): ILineMark;
+    initLineMarkStyle(direction?: DirectionType, areaCurveType?: InterpolateType): ILineMark;
+    protected _getEventElement(params: DimensionEventParams, reverse?: boolean): Datum[];
+    protected _dimensionTrigger(params: DimensionEventParams): void;
+    initSymbolMark(progressive?: IMarkProgressiveConfig, isSeriesMark?: boolean): ISymbolMark;
+    initSymbolMarkStyle(): ISymbolMark;
+    initLabelMarkStyle(labelMark?: ITextMark): void;
+    encodeDefined(mark: IMark, attr: string): void;
+}