@visactor/vchart 1.15.5-alpha.8 → 2.0.0-alpha.0

package/cjs/mark/cell.js

@@ -4,24 +4,36 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerCellMark = exports.CellMark = void 0;
 
-const factory_1 = require("./../core/factory"), symbol_1 = require("./symbol"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_components_1 = require("@visactor/vrender-components"), vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), base_1 = require("./base");
 
-class CellMark extends symbol_1.BaseSymbolMark {
+class CellMark extends base_1.BaseMark {
     constructor() {
         super(...arguments), this.type = CellMark.type;
     }
     _getDefaultStyle() {
         return Object.assign(Object.assign({}, super._getDefaultStyle()), {
+            fill: void 0,
+            lineWidth: 0,
             padding: 0
         });
     }
+    _createGraphic(attrs = {}) {
+        return (0, vrender_core_1.createSymbol)(attrs);
+    }
+    _transformGraphicAttributes(g, attrs, groupAttrs) {
+        var _a, _b, _c;
+        const symbolAttrs = super._transformGraphicAttributes(g, attrs, groupAttrs), symbolType = null !== (_b = null !== (_a = symbolAttrs.shape) && void 0 !== _a ? _a : symbolAttrs.symbolType) && void 0 !== _b ? _b : null === (_c = g.attribute) || void 0 === _c ? void 0 : _c.symbolType;
+        return (0, vutils_1.isNil)(symbolType) ? symbolAttrs.symbolType = "rect" : symbolAttrs.symbolType = symbolType, 
+        symbolAttrs;
+    }
 }
 
 exports.CellMark = CellMark, CellMark.type = "cell";
 
 const registerCellMark = () => {
-    factory_1.Factory.registerMark(CellMark.type, CellMark), (0, vgrammar_core_1.registerCellGraphic)(), 
-    (0, vgrammar_core_1.registerCellMark)();
+    factory_1.Factory.registerMark(CellMark.type, CellMark), factory_1.Factory.registerGraphicComponent("symbol", vrender_core_1.createSymbol), 
+    (0, vrender_kits_1.registerShadowRoot)(), (0, vrender_kits_1.registerSymbol)(), 
+    (0, vrender_components_1.registerSymbolDataLabel)();
 };
 
 exports.registerCellMark = registerCellMark;

package/cjs/mark/cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/cell.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAK5C,qCAA0C;AAC1C,2DAA4G;AAE5G,MAAa,QAAS,SAAQ,uBAA6B;IAA3D;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,OAAO,EAAE,CAAC,GACX,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,UAAqB;AAYpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,gCAAwB,GAAE,CAAC;AAC7B,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"cell.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ICellMarkSpec } from '../typings';\nimport type { ICellMark, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { BaseSymbolMark } from './symbol';\nimport { registerCellGraphic, registerCellMark as registerVgrammarCellMark } from '@visactor/vgrammar-core';\n\nexport class CellMark extends BaseSymbolMark<ICellMarkSpec> implements ICellMark {\n  static readonly type = MarkTypeEnum.cell;\n  readonly type = CellMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ICellMarkSpec> = {\n      ...super._getDefaultStyle(),\n      padding: 0\n    };\n    return defaultStyle;\n  }\n}\n\nexport const registerCellMark = () => {\n  Factory.registerMark(CellMark.type, CellMark);\n  registerCellGraphic();\n  registerVgrammarCellMark();\n};\n"]}
+{"version":3,"sources":["../src/mark/cell.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAK5C,yDAA4E;AAC5E,qEAAuE;AAEvE,yDAAsD;AACtD,6CAAyC;AACzC,iCAAkC;AAElC,MAAa,QAAS,SAAQ,eAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IA4BhC,CAAC;IA1BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,EACZ,OAAO,EAAE,CAAC,GACX,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,cAAc,CAAC,QAAa,EAAE;QACtC,OAAO,IAAA,2BAAY,EAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAES,2BAA2B,CAAC,CAAW,EAAE,KAAU,EAAE,UAAgB;;QAC7E,MAAM,WAAW,GAAG,KAAK,CAAC,2BAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5E,MAAM,UAAU,GACd,MAAA,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,UAAU,mCAAI,MAAC,CAAC,CAAC,SAAqC,0CAAE,UAAU,CAAC;QAEtG,IAAI,IAAA,cAAK,EAAC,UAAU,CAAC,EAAE;YACrB,WAAW,CAAC,UAAU,GAAG,MAAM,CAAC;SACjC;aAAM;YACL,WAAW,CAAC,UAAU,GAAG,UAAU,CAAC;SACrC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;;AA7BH,4BA8BC;AA7BiB,aAAI,UAAqB;AA+BpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE9C,iBAAO,CAAC,wBAAwB,WAAsB,2BAAY,CAAC,CAAC;IAEpE,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4CAAuB,GAAE,CAAC;AAC5B,CAAC,CAAC;AARW,QAAA,gBAAgB,oBAQ3B","file":"cell.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ICellMarkSpec } from '../typings';\nimport type { ICellMark, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerShadowRoot, registerSymbol } from '@visactor/vrender-kits';\nimport { registerSymbolDataLabel } from '@visactor/vrender-components';\nimport type { IGraphic, ISymbolGraphicAttribute } from '@visactor/vrender-core';\nimport { createSymbol } from '@visactor/vrender-core';\nimport { isNil } from '@visactor/vutils';\nimport { BaseMark } from './base';\n\nexport class CellMark extends BaseMark<ICellMarkSpec> implements ICellMark {\n  static readonly type = MarkTypeEnum.cell;\n  readonly type = CellMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ICellMarkSpec> = {\n      ...super._getDefaultStyle(),\n      fill: undefined,\n      lineWidth: 0,\n      padding: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _createGraphic(attrs: any = {}): IGraphic {\n    return createSymbol(attrs);\n  }\n\n  protected _transformGraphicAttributes(g: IGraphic, attrs: any, groupAttrs?: any) {\n    const symbolAttrs = super._transformGraphicAttributes(g, attrs, groupAttrs);\n    const symbolType =\n      symbolAttrs.shape ?? symbolAttrs.symbolType ?? (g.attribute as ISymbolGraphicAttribute)?.symbolType;\n\n    if (isNil(symbolType)) {\n      symbolAttrs.symbolType = 'rect';\n    } else {\n      symbolAttrs.symbolType = symbolType;\n    }\n    return symbolAttrs;\n  }\n}\n\nexport const registerCellMark = () => {\n  Factory.registerMark(CellMark.type, CellMark);\n\n  Factory.registerGraphicComponent(MarkTypeEnum.symbol, createSymbol);\n\n  registerShadowRoot();\n  registerSymbol();\n  registerSymbolDataLabel();\n};\n"]}

package/cjs/mark/component.d.ts

@@ -1,14 +1,22 @@
-import type { IGroupMark } from '@visactor/vgrammar-core';
 import type { ICommonSpec } from '../typings';
 import { BaseMark } from './base/base-mark';
-import type { IComponentMark, IMarkOption } from './interface';
+import type { IComponentMark, IMarkOption, IMarkStyle } from './interface';
 import { MarkTypeEnum } from './interface/type';
+import type { IGraphic, IGroupGraphicAttribute } from '@visactor/vrender-core';
 export declare class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {
     static readonly type = MarkTypeEnum.component;
     type: string;
     private _componentType;
+    private _component;
     private _mode;
     constructor(name: string, option: IMarkOption);
-    protected _initProduct(group?: string | IGroupMark): void;
+    protected _getDefaultStyle(): IMarkStyle<ICommonSpec>;
+    getComponent(): IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;
+    protected _getAttrsFromConfig(attrs?: IGroupGraphicAttribute): IGroupGraphicAttribute;
+    protected _attributesTransform: (attrs: any) => any;
+    setAttributeTransform(t: (attrs: any) => any): void;
+    renderInner(): void;
+    render(): void;
+    release(): void;
 }
 export declare const registerComponentMark: () => void;

package/cjs/mark/component.js

@@ -4,19 +4,46 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerComponentMark = exports.ComponentMark = void 0;
 
-const factory_1 = require("./../core/factory"), vgrammar_core_1 = require("@visactor/vgrammar-core"), base_mark_1 = require("./base/base-mark");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vutils_1 = require("@visactor/vutils"), event_1 = require("../constant/event"), debug_1 = require("../util/debug");
 
 class ComponentMark extends base_mark_1.BaseMark {
     constructor(name, option) {
         super(name, option), this.type = "component", this._componentType = option.componentType, 
         this._mode = option.mode;
     }
-    _initProduct(group) {
-        const view = this.getVGrammarView(), id = this.getProductId();
-        this._product = view.mark(vgrammar_core_1.GrammarMarkType.component, null != group ? group : view.rootMark, {
-            componentType: this._componentType,
-            mode: this._mode
-        }).id(id), this._compiledProductId = id;
+    _getDefaultStyle() {
+        return {};
+    }
+    getComponent() {
+        return this._component;
+    }
+    _getAttrsFromConfig(attrs = {}) {
+        const configAttrs = super._getAttrsFromConfig(attrs);
+        return (0, vutils_1.isNil)(this._markConfig.interactive) || (configAttrs.pickable = this._markConfig.interactive), 
+        attrs;
+    }
+    setAttributeTransform(t) {
+        this._attributesTransform = t;
+    }
+    renderInner() {
+        var _a;
+        const style = null !== (_a = this._simpleStyle) && void 0 !== _a ? _a : this.getAttributesOfState({});
+        let attrs = this._getAttrsFromConfig(style);
+        this._attributesTransform && (attrs = this._attributesTransform(attrs)), this._component ? this._component.setAttributes(attrs) : (this._component = factory_1.Factory.createGraphicComponent(this._componentType, attrs, {
+            mode: this._mode,
+            skipDefault: this._markConfig.skipTheme
+        }), this._component && this._product.appendChild(this._component)), this._component && (this._component.context = this._getCommonContext()), 
+        this._markConfig.support3d && this._product && this._product.setMode("3d"), this.model.event.emit(event_1.HOOK_EVENT.AFTER_ELEMENT_ENCODE, {
+            mark: this,
+            model: this.model
+        });
+    }
+    render() {
+        this._isCommited && ((0, debug_1.log)(`render mark: ${this.getProductId()}, type is ${this.type}`), 
+        this.renderInner(), this.uncommit());
+    }
+    release() {
+        super.release(), this.removeProduct();
     }
 }
 

package/cjs/mark/component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAG5C,2DAA0D;AAE1D,gDAA4C;AAK5C,MAAa,aAAc,SAAQ,oBAAqB;IAOtD,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QANtB,SAAI,GAAW,WAAW,CAAC;QAQzB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI;aACjB,IAAI,CAAC,+BAAe,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;aACjH,EAAE,CAAC,EAAE,CAAC,CAAC;QACV,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAvBH,sCAwBC;AAvBiB,kBAAI,eAA0B;AAyBzC,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC","file":"component.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport type { ICommonSpec } from '../typings';\nimport { BaseMark } from './base/base-mark';\nimport type { IComponentMark, IMarkOption } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {\n  static readonly type = MarkTypeEnum.component;\n  type: string = 'component';\n\n  private _componentType: string;\n  private _mode: '2d' | '3d';\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n    // 这里需要将 type 指定为具体的组件名称，即调用 vgrammar 的 registerComponent API 注册的组件名称\n    this._componentType = option.componentType;\n    this._mode = option.mode;\n  }\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    this._product = view\n      .mark(GrammarMarkType.component, group ?? view.rootMark, { componentType: this._componentType, mode: this._mode })\n      .id(id);\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerComponentMark = () => {\n  Factory.registerMark(ComponentMark.type, ComponentMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":"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","file":"component.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ICommonSpec } from '../typings';\nimport { BaseMark } from './base/base-mark';\nimport type { IComponentMark, IMarkOption, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport type { IGraphic, IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { isNil } from '@visactor/vutils';\nimport { HOOK_EVENT } from '../constant/event';\nimport { log } from '../util/debug';\n\nexport class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {\n  static readonly type = MarkTypeEnum.component;\n  type: string = 'component';\n\n  private _componentType: string;\n  private _component: IGraphic;\n  private _mode: '2d' | '3d';\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n    // 这里需要将 type 指定为具体的组件名称，即调用 vgrammar 的 registerComponent API 注册的组件名称\n    this._componentType = option.componentType;\n\n    this._mode = option.mode;\n  }\n\n  protected _getDefaultStyle(): IMarkStyle<ICommonSpec> {\n    return {};\n  }\n\n  getComponent() {\n    return this._component;\n  }\n\n  protected _getAttrsFromConfig(attrs: IGroupGraphicAttribute = {}) {\n    const configAttrs = super._getAttrsFromConfig(attrs);\n\n    if (!isNil(this._markConfig.interactive)) {\n      configAttrs.pickable = this._markConfig.interactive;\n    }\n    return attrs;\n  }\n\n  protected _attributesTransform: (attrs: any) => any;\n  setAttributeTransform(t: (attrs: any) => any) {\n    this._attributesTransform = t;\n  }\n\n  renderInner() {\n    const style = this._simpleStyle ?? this.getAttributesOfState({});\n\n    let attrs = this._getAttrsFromConfig(style as unknown as IGroupGraphicAttribute);\n\n    if (this._attributesTransform) {\n      attrs = this._attributesTransform(attrs);\n    }\n\n    if (!this._component) {\n      this._component = Factory.createGraphicComponent(this._componentType, attrs, {\n        mode: this._mode,\n        skipDefault: this._markConfig.skipTheme\n      });\n      this._component && this._product.appendChild(this._component);\n    } else {\n      this._component.setAttributes(attrs as any);\n    }\n\n    if (this._component) {\n      this._component.context = this._getCommonContext();\n    }\n\n    if (this._markConfig.support3d && this._product) {\n      this._product.setMode('3d');\n    }\n\n    this.model.event.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, {\n      mark: this,\n      model: this.model\n    });\n  }\n\n  render(): void {\n    if (!this._isCommited) {\n      return;\n    }\n    log(`render mark: ${this.getProductId()}, type is ${this.type}`);\n    this.renderInner();\n\n    this.uncommit();\n  }\n\n  release() {\n    super.release();\n    this.removeProduct();\n  }\n}\n\nexport const registerComponentMark = () => {\n  Factory.registerMark(ComponentMark.type, ComponentMark);\n};\n"]}

package/cjs/mark/glyph.d.ts

@@ -0,0 +1,29 @@
+import type { ICommonSpec } from '../typings/visual';
+import { BaseMark } from './base/base-mark';
+import type { IGlyph, IGlyphGraphicAttribute, IGraphic } from '@visactor/vrender-core';
+import type { IGlyphMark } from './interface/mark';
+import type { MarkType } from './interface/type';
+import type { Datum } from '../typings/common';
+import type { IMarkGraphic } from './interface/common';
+export declare abstract class GlyphMark<T extends ICommonSpec = ICommonSpec, Cfg = any> extends BaseMark<T> implements IGlyphMark<T, Cfg> {
+    protected _defaultGlyphAttrs: T;
+    protected _subMarks: Record<string, {
+        type: MarkType;
+        defaultAttributes?: any;
+    }>;
+    getSubMarks(): Record<string, {
+        type: string;
+        defaultAttributes?: any;
+    }>;
+    protected _glyphConfig: Cfg;
+    setGlyphConfig(cfg: Cfg): void;
+    getGlyphConfig(): Cfg;
+    protected _positionChannels: string[];
+    getPositionChannels(): string[];
+    protected _positionEncoder: (glyphAttrs: any, datum: Datum, g: IGlyph) => Record<string, any>;
+    protected _channelEncoder: Record<string, (channelValue: any) => Record<string, any>>;
+    private _onGlyphAttributeUpdate;
+    protected _setStateOfGraphic: (g: IMarkGraphic) => void;
+    protected _createGraphic(attrs?: IGlyphGraphicAttribute): IGraphic;
+}
+export declare const registerGlyphMark: () => void;

package/cjs/mark/glyph.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.registerGlyphMark = exports.GlyphMark = void 0;
+
+const base_mark_1 = require("./base/base-mark"), vrender_core_1 = require("@visactor/vrender-core"), factory_1 = require("../core/factory"), vrender_kits_1 = require("@visactor/vrender-kits"), enum_1 = require("./interface/enum"), vutils_1 = require("@visactor/vutils");
+
+class GlyphMark extends base_mark_1.BaseMark {
+    constructor() {
+        super(...arguments), this._setStateOfGraphic = g => {
+            g.clearStates(), g.stateProxy = null, g.context.diffState !== enum_1.DiffState.enter && g.context.diffState !== enum_1.DiffState.update || (g.glyphStateProxy = (stateName, nexStates) => {
+                var _a;
+                const glyphAttrs = {
+                    attributes: Object.assign(Object.assign({}, this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a[stateName], g)), g.runtimeStateCache ? g.runtimeStateCache[stateName] : null)
+                };
+                return g.glyphStates ? g.glyphStates[stateName] || (g.glyphStates[stateName] = glyphAttrs) : g.glyphStates = {
+                    [stateName]: glyphAttrs
+                }, glyphAttrs;
+            }, g.useStates(g.context.states));
+        };
+    }
+    getSubMarks() {
+        return this._subMarks;
+    }
+    setGlyphConfig(cfg) {
+        this._glyphConfig = cfg;
+    }
+    getGlyphConfig() {
+        return this._glyphConfig;
+    }
+    getPositionChannels() {
+        return this._positionChannels;
+    }
+    _onGlyphAttributeUpdate(glyph) {
+        return newAttributes => {
+            var _a, _b;
+            const positionChannels = this.getPositionChannels();
+            let subAttrsMap = positionChannels && this._positionEncoder && Object.keys(newAttributes).some((k => positionChannels.includes(k))) ? this._positionEncoder(newAttributes, null === (_b = null === (_a = null == glyph ? void 0 : glyph.context) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0], glyph) : null;
+            return this._channelEncoder && Object.keys(this._channelEncoder).forEach((channel => {
+                if (channel in newAttributes) {
+                    const channelAttrsMap = this._channelEncoder[channel](newAttributes[channel]);
+                    subAttrsMap = subAttrsMap ? (0, vutils_1.merge)(subAttrsMap, channelAttrsMap) : channelAttrsMap;
+                }
+            })), subAttrsMap && glyph.getSubGraphic().forEach((subGraphic => {
+                subGraphic && subAttrsMap[subGraphic.name] && subGraphic.setAttributes(subAttrsMap[subGraphic.name]);
+            })), newAttributes;
+        };
+    }
+    _createGraphic(attrs = {}) {
+        const glyph = (0, vrender_core_1.createGlyph)(attrs);
+        glyph.onBeforeAttributeUpdate = this._onGlyphAttributeUpdate(glyph);
+        const subMarks = this._subMarks;
+        if (subMarks) {
+            const subGraphics = [];
+            Object.keys(subMarks).forEach((name => {
+                const subGraphic = factory_1.Factory.createGraphicComponent(subMarks[name].type, Object.assign({}, subMarks[name].defaultAttributes));
+                subGraphic && (subGraphics.push(subGraphic), subGraphic.name = name, subGraphic.onBeforeAttributeUpdate = attrs => attrs);
+            })), glyph.setSubGraphic(subGraphics);
+        }
+        return glyph.onBeforeAttributeUpdate(attrs), glyph;
+    }
+}
+
+exports.GlyphMark = GlyphMark;
+
+const registerGlyphMark = () => {
+    factory_1.Factory.registerGraphicComponent("glyph", vrender_core_1.createGlyph), 
+    (0, vrender_kits_1.registerShadowRoot)(), (0, vrender_kits_1.registerGlyph)();
+};
+
+exports.registerGlyphMark = registerGlyphMark;
+//# sourceMappingURL=glyph.js.map

package/cjs/mark/glyph.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/mark/glyph.ts"],"names":[],"mappings":"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","file":"glyph.js","sourcesContent":["import type { ICommonSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IGlyph, IGlyphGraphicAttribute, IGraphic } from '@visactor/vrender-core';\nimport { createGlyph } from '@visactor/vrender-core';\nimport type { IGlyphMark } from './interface/mark';\nimport type { MarkType } from './interface/type';\nimport { Factory } from '../core/factory';\nimport type { Datum } from '../typings/common';\nimport { registerGlyph, registerShadowRoot } from '@visactor/vrender-kits';\nimport type { IMarkGraphic } from './interface/common';\nimport { DiffState } from './interface/enum';\nimport { merge } from '@visactor/vutils';\nexport abstract class GlyphMark<T extends ICommonSpec = ICommonSpec, Cfg = any>\n  extends BaseMark<T>\n  implements IGlyphMark<T, Cfg>\n{\n  protected _defaultGlyphAttrs: T;\n\n  protected _subMarks: Record<\n    string,\n    {\n      type: MarkType;\n      defaultAttributes?: any;\n    }\n  >;\n\n  getSubMarks() {\n    return this._subMarks;\n  }\n\n  protected _glyphConfig: Cfg;\n\n  setGlyphConfig(cfg: Cfg) {\n    this._glyphConfig = cfg;\n  }\n\n  getGlyphConfig() {\n    return this._glyphConfig;\n  }\n\n  protected _positionChannels: string[];\n\n  getPositionChannels() {\n    return this._positionChannels;\n  }\n\n  protected _positionEncoder: (glyphAttrs: any, datum: Datum, g: IGlyph) => Record<string, any>;\n\n  protected _channelEncoder: Record<string, (channelValue: any) => Record<string, any>>;\n\n  private _onGlyphAttributeUpdate(glyph: IGlyph) {\n    return (newAttributes: any) => {\n      const positionChannels = this.getPositionChannels();\n      let subAttrsMap =\n        positionChannels && this._positionEncoder && Object.keys(newAttributes).some(k => positionChannels.includes(k))\n          ? this._positionEncoder(newAttributes, glyph?.context?.data?.[0], glyph)\n          : null;\n\n      if (this._channelEncoder) {\n        Object.keys(this._channelEncoder).forEach(channel => {\n          if (channel in newAttributes) {\n            const channelAttrsMap = this._channelEncoder[channel](newAttributes[channel]);\n\n            subAttrsMap = subAttrsMap ? merge(subAttrsMap, channelAttrsMap) : channelAttrsMap;\n          }\n        });\n      }\n\n      if (subAttrsMap) {\n        glyph.getSubGraphic().forEach(subGraphic => {\n          if (subGraphic && subAttrsMap[subGraphic.name]) {\n            subGraphic.setAttributes(subAttrsMap[subGraphic.name]);\n          }\n        });\n      }\n\n      return newAttributes;\n    };\n  }\n\n  protected _setStateOfGraphic = (g: IMarkGraphic) => {\n    g.clearStates();\n    g.stateProxy = null;\n\n    if (g.context.diffState === DiffState.enter || g.context.diffState === DiffState.update) {\n      g.glyphStateProxy = (stateName: string, nexStates: string[]) => {\n        const glyphAttrs = {\n          attributes: {\n            ...this._runEncoderOfGraphic(this._encoderOfState?.[stateName], g),\n            ...(g.runtimeStateCache ? g.runtimeStateCache[stateName] : null)\n          }\n        };\n\n        // 更新缓存\n        if (!g.glyphStates) {\n          g.glyphStates = { [stateName]: glyphAttrs };\n        } else if (!g.glyphStates[stateName]) {\n          g.glyphStates[stateName] = glyphAttrs;\n        }\n\n        return glyphAttrs;\n      };\n\n      g.useStates(g.context.states);\n    }\n  };\n\n  protected _createGraphic(attrs: IGlyphGraphicAttribute = {}): IGraphic {\n    const glyph = createGlyph(attrs);\n    glyph.onBeforeAttributeUpdate = this._onGlyphAttributeUpdate(glyph);\n    const subMarks = this._subMarks;\n\n    if (subMarks) {\n      const subGraphics: IGraphic[] = [];\n\n      Object.keys(subMarks).forEach(name => {\n        // glyph 中的子元素会继承glyph 的 x,y，所以子元素手动设置一下，x: 0, y: 0\n        const subGraphic = Factory.createGraphicComponent(subMarks[name].type, {\n          ...subMarks[name].defaultAttributes\n        });\n\n        if (subGraphic) {\n          subGraphics.push(subGraphic);\n\n          subGraphic.name = name;\n          subGraphic.onBeforeAttributeUpdate = (attrs: any) => {\n            return attrs;\n          };\n        }\n      });\n\n      glyph.setSubGraphic(subGraphics);\n    }\n\n    (glyph as any).onBeforeAttributeUpdate(attrs);\n\n    return glyph;\n  }\n}\n\nexport const registerGlyphMark = () => {\n  Factory.registerGraphicComponent('glyph', createGlyph);\n  registerShadowRoot();\n  registerGlyph();\n};\n"]}

package/cjs/mark/group.d.ts

@@ -1,18 +1,17 @@
 import type { Maybe } from '../typings';
 import type { IGroupMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
-import type { IGroupMark, IMark, IMarkStyle, MarkType } from './interface';
+import type { IGroupMark, IMark, IMarkGraphic, MarkType } from './interface';
 import { MarkTypeEnum } from './interface/type';
-import type { IGroupMark as IVGrammarGroupMark } from '@visactor/vgrammar-core';
-import type { IMarkCompileOption } from '../compile/mark';
+import { type IMarkCompileOption } from '../compile/mark';
+import type { IGroup, IGroupGraphicAttribute } from '@visactor/vrender-core';
 export declare class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {
     static readonly type = MarkTypeEnum.group;
     readonly type = MarkTypeEnum.group;
     protected _marks: IMark[];
     getMarks(): IMark[];
-    protected _product: Maybe<IVGrammarGroupMark>;
-    getProduct: () => Maybe<IVGrammarGroupMark>;
-    protected _getDefaultStyle(): IMarkStyle<IGroupMarkSpec>;
+    protected _product: Maybe<IGroup>;
+    getProduct: () => Maybe<IGroup>;
     protected isMarkExist(mark: IMark): boolean;
     addMark(mark: IMark): boolean;
     removeMark(mark: IMark): boolean;
@@ -21,5 +20,10 @@ export declare class GroupMark extends BaseMark<IGroupMarkSpec> implements IGrou
     getMarkInUserId(id: string | number): IMark;
     getMarkInName(name: string): IMark[];
     protected _compileProduct(option?: IMarkCompileOption): void;
+    protected _getAttrsFromConfig(attrs?: IGroupGraphicAttribute): IGroupGraphicAttribute;
+    getGraphics(): IMarkGraphic[];
+    protected _renderSelf(): void;
+    render(): void;
+    release(): void;
 }
 export declare const registerGroupMark: () => void;

package/cjs/mark/group.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerGroupMark = exports.GroupMark = void 0;
 
-const factory_1 = require("./../core/factory"), debug_1 = require("../util/debug"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), debug_1 = require("../util/debug"), base_mark_1 = require("./base/base-mark"), vrender_kits_1 = require("@visactor/vrender-kits"), vutils_1 = require("@visactor/vutils"), util_1 = require("../compile/util");
 
 class GroupMark extends base_mark_1.BaseMark {
     constructor() {
@@ -13,9 +13,6 @@ class GroupMark extends base_mark_1.BaseMark {
     getMarks() {
         return this._marks;
     }
-    _getDefaultStyle() {
-        return Object.assign({}, super._getDefaultStyle());
-    }
     isMarkExist(mark) {
         return void 0 !== this._marks.find((m => m.id === mark.id));
     }
@@ -36,32 +33,49 @@ class GroupMark extends base_mark_1.BaseMark {
     }
     getMarkInUserId(id) {
         let result;
-        if (this._marks.forEach((m => {
-            m.getUserId() === id && (result = m);
-        })), !result) for (let i = 0; i < this._marks.length; i++) {
-            const mark = this._marks[i];
-            if ("group" === mark.type && (result = mark.getMarkInUserId(id)), result) break;
-        }
-        return result;
+        return (0, util_1.traverseGroupMark)(this, (m => {
+            result = m;
+        }), (m => m.getUserId() === id), null, !0), result;
     }
     getMarkInName(name) {
         return this._marks.filter((m => m.name === name));
     }
     _compileProduct(option) {
-        super._compileProduct(option), this._product.configure({
-            zIndex: this._markConfig.zIndex
-        }), (null == option ? void 0 : option.ignoreChildren) || this.getMarks().forEach((mark => {
-            mark.getProduct() && mark.removeProduct(), mark.compile({
+        super._compileProduct(option), this.getMarks().forEach((mark => {
+            mark.compile({
                 group: this._product
             });
         }));
     }
+    _getAttrsFromConfig(attrs = {}) {
+        const configAttrs = super._getAttrsFromConfig(attrs);
+        return (0, vutils_1.isNil)(this._markConfig.interactive) || (configAttrs.pickable = this._markConfig.interactive), 
+        attrs;
+    }
+    getGraphics() {
+        return [ this._product ];
+    }
+    _renderSelf() {
+        var _a;
+        if (!this._product) return;
+        const style = null !== (_a = this._simpleStyle) && void 0 !== _a ? _a : this.getAttributesOfState({});
+        this._product.context = this._getCommonContext(), this._product.setAttributes(this._getAttrsFromConfig(style));
+    }
+    render() {
+        this._isCommited && ((0, debug_1.log)(`render mark: ${this.getProductId()}, type is ${this.type}`), 
+        this._renderSelf(), this.uncommit()), this.getMarks().forEach((mark => {
+            mark.render();
+        }));
+    }
+    release() {
+        super.release(), this.removeProduct();
+    }
 }
 
 exports.GroupMark = GroupMark, GroupMark.type = "group";
 
 const registerGroupMark = () => {
-    (0, vgrammar_core_1.registerGroupGraphic)(), factory_1.Factory.registerMark(GroupMark.type, GroupMark);
+    (0, vrender_kits_1.registerShadowRoot)(), (0, vrender_kits_1.registerGroup)(), factory_1.Factory.registerMark(GroupMark.type, GroupMark);
 };
 
 exports.registerGroupMark = registerGroupMark;

package/cjs/mark/group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { Maybe } from '../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { warn } from '../util/debug';\nimport type { IGroupMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IGroupMark, IMark, IMarkStyle, MarkType } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport type { IGroupMark as IVGrammarGroupMark } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerGroupGraphic } from '@visactor/vgrammar-core';\nimport type { IMarkCompileOption } from '../compile/mark';\n\nexport class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {\n  static readonly type = MarkTypeEnum.group;\n  readonly type = GroupMark.type;\n  protected _marks: IMark[] = [];\n  getMarks(): IMark[] {\n    return this._marks;\n  }\n\n  protected declare _product: Maybe<IVGrammarGroupMark>;\n  declare getProduct: () => Maybe<IVGrammarGroupMark>;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IGroupMarkSpec> = {\n      ...super._getDefaultStyle()\n      // clip: false\n    };\n    return defaultStyle;\n  }\n\n  protected isMarkExist(mark: IMark): boolean {\n    return this._marks.find(m => m.id === mark.id) !== undefined;\n  }\n\n  addMark(mark: IMark): boolean {\n    if (this.isMarkExist(mark)) {\n      warn('Mark already exists, add mark failed.');\n      return false;\n    }\n\n    this._marks.push(mark);\n    return true;\n  }\n\n  removeMark(mark: IMark): boolean {\n    const index = this._marks.findIndex(m => m.id === mark.id || m.name === mark.name);\n    if (index === -1) {\n      warn('Mark does not exists, removeMark failed.');\n      return false;\n    }\n    this._marks.splice(index, 1);\n    return true;\n  }\n\n  getMarkInType(type: MarkType) {\n    return this._marks.filter(m => m.type === type);\n  }\n\n  getMarkInId(id: number) {\n    return this._marks.find(m => m.id === id);\n  }\n\n  getMarkInUserId(id: string | number) {\n    let result: IMark | undefined;\n    this._marks.forEach(m => {\n      if (m.getUserId() === id) {\n        result = m;\n      }\n    });\n\n    if (!result) {\n      for (let i = 0; i < this._marks.length; i++) {\n        const mark = this._marks[i];\n        if (mark.type === 'group') {\n          result = (mark as GroupMark).getMarkInUserId(id);\n        }\n        if (result) {\n          break;\n        }\n      }\n    }\n\n    return result;\n  }\n\n  getMarkInName(name: string) {\n    return this._marks.filter(m => m.name === name);\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption): void {\n    // 编译自身\n    super._compileProduct(option);\n\n    // 设置zIndex\n    this._product.configure({\n      zIndex: this._markConfig.zIndex\n    });\n\n    // 编译子元素\n    if (!option?.ignoreChildren) {\n      this.getMarks().forEach(mark => {\n        // TODO: 如果语法元素已创建，先删除再重新指定父结点生成。vgrammar 是否可以动态指定 mark 父结点？\n        if (mark.getProduct()) {\n          mark.removeProduct();\n        }\n        mark.compile({ group: this._product });\n      });\n    }\n  }\n}\n\nexport const registerGroupMark = () => {\n  registerGroupGraphic();\n  Factory.registerMark(GroupMark.type, GroupMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { Maybe } from '../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { log, warn } from '../util/debug';\nimport type { IGroupMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IGroupMark, IMark, IMarkGraphic, MarkType } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { type IMarkCompileOption } from '../compile/mark';\nimport type { IGroup, IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { registerGroup, registerShadowRoot } from '@visactor/vrender-kits';\nimport { isNil } from '@visactor/vutils';\nimport { traverseGroupMark } from '../compile/util';\n\nexport class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {\n  static readonly type = MarkTypeEnum.group;\n  readonly type = GroupMark.type;\n  protected _marks: IMark[] = [];\n  getMarks(): IMark[] {\n    return this._marks;\n  }\n\n  protected declare _product: Maybe<IGroup>;\n  declare getProduct: () => Maybe<IGroup>;\n\n  protected isMarkExist(mark: IMark): boolean {\n    return this._marks.find(m => m.id === mark.id) !== undefined;\n  }\n\n  addMark(mark: IMark): boolean {\n    if (this.isMarkExist(mark)) {\n      warn('Mark already exists, add mark failed.');\n      return false;\n    }\n\n    this._marks.push(mark);\n    return true;\n  }\n\n  removeMark(mark: IMark): boolean {\n    const index = this._marks.findIndex(m => m.id === mark.id || m.name === mark.name);\n    if (index === -1) {\n      warn('Mark does not exists, removeMark failed.');\n      return false;\n    }\n    this._marks.splice(index, 1);\n    return true;\n  }\n\n  getMarkInType(type: MarkType) {\n    return this._marks.filter(m => m.type === type);\n  }\n\n  getMarkInId(id: number) {\n    return this._marks.find(m => m.id === id);\n  }\n\n  getMarkInUserId(id: string | number) {\n    let result: IMark | undefined;\n    traverseGroupMark(\n      this,\n      m => {\n        result = m;\n      },\n      m => m.getUserId() === id,\n      null,\n      true\n    );\n\n    return result;\n  }\n\n  getMarkInName(name: string) {\n    return this._marks.filter(m => m.name === name);\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption): void {\n    // 编译自身\n    super._compileProduct(option);\n\n    // 设置zIndex\n    // this._product.configure({\n    //   zIndex: this._markConfig.zIndex\n    // });\n\n    // 编译子元素\n    this.getMarks().forEach(mark => {\n      mark.compile({ group: this._product });\n    });\n  }\n\n  protected _getAttrsFromConfig(attrs: IGroupGraphicAttribute = {}) {\n    const configAttrs = super._getAttrsFromConfig(attrs);\n\n    if (!isNil(this._markConfig.interactive)) {\n      configAttrs.pickable = this._markConfig.interactive;\n    }\n    return attrs;\n  }\n\n  getGraphics(): IMarkGraphic[] {\n    return [this._product];\n  }\n\n  protected _renderSelf() {\n    if (!this._product) {\n      return;\n    }\n\n    const style = this._simpleStyle ?? this.getAttributesOfState({});\n\n    this._product.context = this._getCommonContext();\n    this._product.setAttributes(this._getAttrsFromConfig(style));\n  }\n\n  render(): void {\n    if (this._isCommited) {\n      log(`render mark: ${this.getProductId()}, type is ${this.type}`);\n      this._renderSelf();\n      this.uncommit();\n    }\n\n    this.getMarks().forEach(mark => {\n      mark.render();\n    });\n  }\n\n  release() {\n    super.release();\n    this.removeProduct();\n  }\n}\n\nexport const registerGroupMark = () => {\n  registerShadowRoot();\n  registerGroup();\n  Factory.registerMark(GroupMark.type, GroupMark);\n};\n"]}

package/cjs/mark/image.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerImageMark = exports.ImageMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_core_1 = require("@visactor/vrender-core");
 
 class ImageMark extends base_mark_1.BaseMark {
     constructor() {
@@ -22,7 +22,8 @@ class ImageMark extends base_mark_1.BaseMark {
 exports.ImageMark = ImageMark, ImageMark.type = "image";
 
 const registerImageMark = () => {
-    factory_1.Factory.registerMark(ImageMark.type, ImageMark), (0, vgrammar_core_1.registerImageGraphic)();
+    factory_1.Factory.registerMark(ImageMark.type, ImageMark), (0, vrender_kits_1.registerShadowRoot)(), 
+    (0, vrender_kits_1.registerImage)(), factory_1.Factory.registerGraphicComponent("image", vrender_core_1.createImage);
 };
 
 exports.registerImageMark = registerImageMark;

package/cjs/mark/image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAA+D;AAE/D,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAWjC,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,8BAaC;AAZiB,cAAI,WAAsB;AAcrC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAChD,IAAA,oCAAoB,GAAE,CAAC;AACzB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"image.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IImageMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IImageMark, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerImageGraphic } from '@visactor/vgrammar-core';\n\nexport class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {\n  static readonly type = MarkTypeEnum.image;\n  readonly type = ImageMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IImageMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n\nexport const registerImageMark = () => {\n  Factory.registerMark(ImageMark.type, ImageMark);\n  registerImageGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,yDAA2E;AAC3E,yDAAqD;AAErD,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAWjC,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,8BAaC;AAZiB,cAAI,WAAsB;AAcrC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAuC,CAAC,CAAC;IAC9E,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,4BAAa,GAAE,CAAC;IAEhB,iBAAO,CAAC,wBAAwB,UAAqB,0BAAW,CAAC,CAAC;AACpE,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B","file":"image.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IImageMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IImageMark, IMarkStyle, MarkConstructor } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerImage, registerShadowRoot } from '@visactor/vrender-kits';\nimport { createImage } from '@visactor/vrender-core';\n\nexport class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {\n  static readonly type = MarkTypeEnum.image;\n  readonly type = ImageMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IImageMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n\nexport const registerImageMark = () => {\n  Factory.registerMark(ImageMark.type, ImageMark as unknown as MarkConstructor);\n  registerShadowRoot();\n  registerImage();\n\n  Factory.registerGraphicComponent(MarkTypeEnum.image, createImage);\n};\n"]}

package/cjs/mark/index.d.ts

@@ -15,7 +15,9 @@ import { BaseMark } from './base';
 import { PolygonMark, registerPolygonMark } from './polygon/polygon';
 import { Pyramid3dMark, registerPyramid3dMark } from './polygon/pyramid-3d';
 import { ImageMark, registerImageMark } from './image';
+import { registerMarkFilterTransform } from './transform/filter';
+import { registerMarkMapTransform } from './transform/map';
 export type { IBoxPlotMarkSpec, ILineMarkSpec, ISymbolMarkSpec, IGroupMarkSpec, IRuleMarkSpec, ITextMarkSpec, IAreaMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IPathMarkSpec, IArcMarkSpec, IArc3dMarkSpec, ICommonSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, ILinkPathMarkSpec, IRippleMarkSpec, ICellMarkSpec, ILiquidMarkSpec, ConvertToMarkStyleSpec } from '../typings/visual';
 export { LineMark, SymbolMark, GroupMark, RuleMark, TextMark, AreaMark, Rect3dMark, RectMark, PathMark, Arc3dMark, ArcMark, ComponentMark, PolygonMark, Pyramid3dMark, RippleMark, ImageMark, BaseMark };
-export { registerLineMark, registerSymbolMark, registerGroupMark, registerRuleMark, registerTextMark, registerAreaMark, registerRectMark, registerRect3dMark, registerPathMark, registerArcMark, registerArc3dMark, registerPolygonMark, registerPyramid3dMark, registerRippleMark, registerImageMark, registerComponentMark };
+export { registerLineMark, registerSymbolMark, registerGroupMark, registerRuleMark, registerTextMark, registerAreaMark, registerRectMark, registerRect3dMark, registerPathMark, registerArcMark, registerArc3dMark, registerPolygonMark, registerPyramid3dMark, registerRippleMark, registerImageMark, registerComponentMark, registerMarkMapTransform, registerMarkFilterTransform };
 export declare const registerAllMarks: () => void;

package/cjs/mark/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.registerAllMarks = exports.registerComponentMark = exports.registerImageMark = exports.registerRippleMark = exports.registerPyramid3dMark = exports.registerPolygonMark = exports.registerArc3dMark = exports.registerArcMark = exports.registerPathMark = exports.registerRect3dMark = exports.registerRectMark = exports.registerAreaMark = exports.registerTextMark = exports.registerRuleMark = exports.registerGroupMark = exports.registerSymbolMark = exports.registerLineMark = exports.BaseMark = exports.ImageMark = exports.RippleMark = exports.Pyramid3dMark = exports.PolygonMark = exports.ComponentMark = exports.ArcMark = exports.Arc3dMark = exports.PathMark = exports.RectMark = exports.Rect3dMark = exports.AreaMark = exports.TextMark = exports.RuleMark = exports.GroupMark = exports.SymbolMark = exports.LineMark = void 0;
+}), exports.registerAllMarks = exports.registerMarkFilterTransform = exports.registerMarkMapTransform = exports.registerComponentMark = exports.registerImageMark = exports.registerRippleMark = exports.registerPyramid3dMark = exports.registerPolygonMark = exports.registerArc3dMark = exports.registerArcMark = exports.registerPathMark = exports.registerRect3dMark = exports.registerRectMark = exports.registerAreaMark = exports.registerTextMark = exports.registerRuleMark = exports.registerGroupMark = exports.registerSymbolMark = exports.registerLineMark = exports.BaseMark = exports.ImageMark = exports.RippleMark = exports.Pyramid3dMark = exports.PolygonMark = exports.ComponentMark = exports.ArcMark = exports.Arc3dMark = exports.PathMark = exports.RectMark = exports.Rect3dMark = exports.AreaMark = exports.TextMark = exports.RuleMark = exports.GroupMark = exports.SymbolMark = exports.LineMark = void 0;
 
 const line_1 = require("./line");
 
@@ -237,6 +237,24 @@ Object.defineProperty(exports, "ImageMark", {
     }
 });
 
+const filter_1 = require("./transform/filter");
+
+Object.defineProperty(exports, "registerMarkFilterTransform", {
+    enumerable: !0,
+    get: function() {
+        return filter_1.registerMarkFilterTransform;
+    }
+});
+
+const map_1 = require("./transform/map");
+
+Object.defineProperty(exports, "registerMarkMapTransform", {
+    enumerable: !0,
+    get: function() {
+        return map_1.registerMarkMapTransform;
+    }
+});
+
 const registerAllMarks = () => {
     (0, group_1.registerGroupMark)(), (0, line_1.registerLineMark)(), (0, symbol_1.registerSymbolMark)(), 
     (0, rule_1.registerRuleMark)(), (0, text_1.registerTextMark)(), (0, area_1.registerAreaMark)(), 

package/cjs/mark/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/index.ts"],"names":[],"mappings":";;;AAGA,iCAAoD;AA8ClD,yFA9CO,eAAQ,OA8CP;AAoBR,iGAlEiB,uBAAgB,OAkEjB;AAjElB,qCAA0D;AA8CxD,2FA9CO,mBAAU,OA8CP;AAoBV,mGAlEmB,2BAAkB,OAkEnB;AAjEpB,mCAAuD;AA8CrD,0FA9CO,iBAAS,OA8CP;AAoBT,kGAlEkB,yBAAiB,OAkElB;AAjEnB,iCAAoD;AA8ClD,yFA9CO,eAAQ,OA8CP;AAoBR,iGAlEiB,uBAAgB,OAkEjB;AAjElB,iCAAoD;AA8ClD,yFA9CO,eAAQ,OA8CP;AAoBR,iGAlEiB,uBAAgB,OAkEjB;AAjElB,iCAAoD;AA8ClD,yFA9CO,eAAQ,OA8CP;AAoBR,iGAlEiB,uBAAgB,OAkEjB;AAjElB,iCAAoD;AA+ClD,yFA/CO,eAAQ,OA+CP;AAmBR,iGAlEiB,uBAAgB,OAkEjB;AAjElB,uCAA2D;AA6CzD,2FA7CO,oBAAU,OA6CP;AAqBV,mGAlEmB,4BAAkB,OAkEnB;AAjEpB,iCAAoD;AA8ClD,yFA9CO,eAAQ,OA8CP;AAoBR,iGAlEiB,uBAAgB,OAkEjB;AAjElB,+BAAiD;AA+C/C,wFA/CO,aAAO,OA+CP;AAmBP,gGAlEgB,qBAAe,OAkEhB;AAjEjB,qCAAwD;AA6CtD,0FA7CO,kBAAS,OA6CP;AAqBT,kGAlEkB,0BAAiB,OAkElB;AAjEnB,2CAAmE;AA8CjE,8FA9CO,yBAAa,OA8CP;AAwBb,sGAtEsB,iCAAqB,OAsEtB;AApEvB,qCAA0D;AA+CxD,2FA/CO,mBAAU,OA+CP;AAmBV,mGAlEmB,2BAAkB,OAkEnB;AAhEpB,iCAAkC;AA+ChC,yFA/CO,eAAQ,OA+CP;AA9CV,+CAAqE;AA0CnE,4FA1CO,qBAAW,OA0CP;AAmBX,oGA7DoB,6BAAmB,OA6DpB;AA5DrB,qDAA4E;AA0C1E,8FA1CO,0BAAa,OA0CP;AAmBb,sGA7DsB,kCAAqB,OA6DtB;AA5DvB,mCAAuD;AA2CrD,0FA3CO,iBAAS,OA2CP;AAmBT,kGA9DkB,yBAAiB,OA8DlB;AAIZ,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAA,yBAAiB,GAAE,CAAC;IACpB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,2BAAkB,GAAE,CAAC;IACrB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,qBAAe,GAAE,CAAC;IAClB,IAAA,6BAAmB,GAAE,CAAC;IACtB,IAAA,yBAAiB,GAAE,CAAC;IACpB,IAAA,2BAAkB,GAAE,CAAC;IACrB,IAAA,iCAAqB,GAAE,CAAC;IACxB,IAAA,0BAAiB,GAAE,CAAC;IACpB,IAAA,4BAAkB,GAAE,CAAC;IACrB,IAAA,kCAAqB,GAAE,CAAC;AAC1B,CAAC,CAAC;AAjBW,QAAA,gBAAgB,oBAiB3B","file":"index.js","sourcesContent":["/**\n * @description export all mark modules\n */\nimport { LineMark, registerLineMark } from './line';\nimport { SymbolMark, registerSymbolMark } from './symbol';\nimport { GroupMark, registerGroupMark } from './group';\nimport { RuleMark, registerRuleMark } from './rule';\nimport { TextMark, registerTextMark } from './text';\nimport { AreaMark, registerAreaMark } from './area';\nimport { RectMark, registerRectMark } from './rect';\nimport { Rect3dMark, registerRect3dMark } from './rect-3d';\nimport { PathMark, registerPathMark } from './path';\nimport { ArcMark, registerArcMark } from './arc';\nimport { Arc3dMark, registerArc3dMark } from './arc-3d';\nimport { ComponentMark, registerComponentMark } from './component';\nimport { LinkPathMark, registerLinkPathMark } from './link-path';\nimport { RippleMark, registerRippleMark } from './ripple';\nimport { CellMark, registerCellMark } from './cell';\nimport { BaseMark } from './base';\nimport { PolygonMark, registerPolygonMark } from './polygon/polygon';\nimport { Pyramid3dMark, registerPyramid3dMark } from './polygon/pyramid-3d';\nimport { ImageMark, registerImageMark } from './image';\nimport { LiquidMark, registerLiquidMark } from './liquid';\nimport { BoxPlotMark, registerBoxPlotMark } from './box-plot';\n\nexport type {\n  IBoxPlotMarkSpec,\n  ILineMarkSpec,\n  ISymbolMarkSpec,\n  IGroupMarkSpec,\n  IRuleMarkSpec,\n  ITextMarkSpec,\n  IAreaMarkSpec,\n  IRect3dMarkSpec,\n  IRectMarkSpec,\n  IPathMarkSpec,\n  IArcMarkSpec,\n  IArc3dMarkSpec,\n  ICommonSpec,\n  IPolygonMarkSpec,\n  IPyramid3dMarkSpec,\n  ILinkPathMarkSpec,\n  IRippleMarkSpec,\n  ICellMarkSpec,\n  ILiquidMarkSpec,\n  ConvertToMarkStyleSpec\n} from '../typings/visual';\n\nexport {\n  LineMark,\n  SymbolMark,\n  GroupMark,\n  RuleMark,\n  TextMark,\n  AreaMark,\n  Rect3dMark,\n  RectMark,\n  PathMark,\n  Arc3dMark,\n  ArcMark,\n  ComponentMark,\n  PolygonMark,\n  Pyramid3dMark,\n  RippleMark,\n  ImageMark,\n  BaseMark\n};\n\nexport {\n  registerLineMark,\n  registerSymbolMark,\n  registerGroupMark,\n  registerRuleMark,\n  registerTextMark,\n  registerAreaMark,\n  registerRectMark,\n  registerRect3dMark,\n  registerPathMark,\n  registerArcMark,\n  registerArc3dMark,\n  registerPolygonMark,\n  registerPyramid3dMark,\n  registerRippleMark,\n  registerImageMark,\n  registerComponentMark\n};\n\nexport const registerAllMarks = () => {\n  registerGroupMark();\n  registerLineMark();\n  registerSymbolMark();\n  registerRuleMark();\n  registerTextMark();\n  registerAreaMark();\n  registerRectMark();\n  registerPathMark();\n  registerArcMark();\n  registerPolygonMark();\n  registerImageMark();\n  registerRippleMark();\n  registerComponentMark();\n  registerArc3dMark();\n  registerRect3dMark();\n  registerPyramid3dMark();\n};\n"]}
+{"version":3,"sources":["../src/mark/index.ts"],"names":[],"mappings":";;;AAGA,iCAAoD;AAgDlD,yFAhDO,eAAQ,OAgDP;AAoBR,iGApEiB,uBAAgB,OAoEjB;AAnElB,qCAA0D;AAgDxD,2FAhDO,mBAAU,OAgDP;AAoBV,mGApEmB,2BAAkB,OAoEnB;AAnEpB,mCAAuD;AAgDrD,0FAhDO,iBAAS,OAgDP;AAoBT,kGApEkB,yBAAiB,OAoElB;AAnEnB,iCAAoD;AAgDlD,yFAhDO,eAAQ,OAgDP;AAoBR,iGApEiB,uBAAgB,OAoEjB;AAnElB,iCAAoD;AAgDlD,yFAhDO,eAAQ,OAgDP;AAoBR,iGApEiB,uBAAgB,OAoEjB;AAnElB,iCAAoD;AAgDlD,yFAhDO,eAAQ,OAgDP;AAoBR,iGApEiB,uBAAgB,OAoEjB;AAnElB,iCAAoD;AAiDlD,yFAjDO,eAAQ,OAiDP;AAmBR,iGApEiB,uBAAgB,OAoEjB;AAnElB,uCAA2D;AA+CzD,2FA/CO,oBAAU,OA+CP;AAqBV,mGApEmB,4BAAkB,OAoEnB;AAnEpB,iCAAoD;AAgDlD,yFAhDO,eAAQ,OAgDP;AAoBR,iGApEiB,uBAAgB,OAoEjB;AAnElB,+BAAiD;AAiD/C,wFAjDO,aAAO,OAiDP;AAmBP,gGApEgB,qBAAe,OAoEhB;AAnEjB,qCAAwD;AA+CtD,0FA/CO,kBAAS,OA+CP;AAqBT,kGApEkB,0BAAiB,OAoElB;AAnEnB,2CAAmE;AAgDjE,8FAhDO,yBAAa,OAgDP;AAwBb,sGAxEsB,iCAAqB,OAwEtB;AAtEvB,qCAA0D;AAiDxD,2FAjDO,mBAAU,OAiDP;AAmBV,mGApEmB,2BAAkB,OAoEnB;AAlEpB,iCAAkC;AAiDhC,yFAjDO,eAAQ,OAiDP;AAhDV,+CAAqE;AA4CnE,4FA5CO,qBAAW,OA4CP;AAmBX,oGA/DoB,6BAAmB,OA+DpB;AA9DrB,qDAA4E;AA4C1E,8FA5CO,0BAAa,OA4CP;AAmBb,sGA/DsB,kCAAqB,OA+DtB;AA9DvB,mCAAuD;AA6CrD,0FA7CO,iBAAS,OA6CP;AAmBT,kGAhEkB,yBAAiB,OAgElB;AA7DnB,+CAAiE;AAgE/D,4GAhEO,oCAA2B,OAgEP;AA/D7B,yCAA2D;AA8DzD,yGA9DO,8BAAwB,OA8DP;AAInB,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAA,yBAAiB,GAAE,CAAC;IACpB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,2BAAkB,GAAE,CAAC;IACrB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,qBAAe,GAAE,CAAC;IAClB,IAAA,6BAAmB,GAAE,CAAC;IACtB,IAAA,yBAAiB,GAAE,CAAC;IACpB,IAAA,2BAAkB,GAAE,CAAC;IACrB,IAAA,iCAAqB,GAAE,CAAC;IACxB,IAAA,0BAAiB,GAAE,CAAC;IACpB,IAAA,4BAAkB,GAAE,CAAC;IACrB,IAAA,kCAAqB,GAAE,CAAC;AAC1B,CAAC,CAAC;AAjBW,QAAA,gBAAgB,oBAiB3B","file":"index.js","sourcesContent":["/**\n * @description export all mark modules\n */\nimport { LineMark, registerLineMark } from './line';\nimport { SymbolMark, registerSymbolMark } from './symbol';\nimport { GroupMark, registerGroupMark } from './group';\nimport { RuleMark, registerRuleMark } from './rule';\nimport { TextMark, registerTextMark } from './text';\nimport { AreaMark, registerAreaMark } from './area';\nimport { RectMark, registerRectMark } from './rect';\nimport { Rect3dMark, registerRect3dMark } from './rect-3d';\nimport { PathMark, registerPathMark } from './path';\nimport { ArcMark, registerArcMark } from './arc';\nimport { Arc3dMark, registerArc3dMark } from './arc-3d';\nimport { ComponentMark, registerComponentMark } from './component';\nimport { LinkPathMark, registerLinkPathMark } from './link-path';\nimport { RippleMark, registerRippleMark } from './ripple';\nimport { CellMark, registerCellMark } from './cell';\nimport { BaseMark } from './base';\nimport { PolygonMark, registerPolygonMark } from './polygon/polygon';\nimport { Pyramid3dMark, registerPyramid3dMark } from './polygon/pyramid-3d';\nimport { ImageMark, registerImageMark } from './image';\nimport { LiquidMark, registerLiquidMark } from './liquid';\nimport { BoxPlotMark, registerBoxPlotMark } from './box-plot';\nimport { registerMarkFilterTransform } from './transform/filter';\nimport { registerMarkMapTransform } from './transform/map';\n\nexport type {\n  IBoxPlotMarkSpec,\n  ILineMarkSpec,\n  ISymbolMarkSpec,\n  IGroupMarkSpec,\n  IRuleMarkSpec,\n  ITextMarkSpec,\n  IAreaMarkSpec,\n  IRect3dMarkSpec,\n  IRectMarkSpec,\n  IPathMarkSpec,\n  IArcMarkSpec,\n  IArc3dMarkSpec,\n  ICommonSpec,\n  IPolygonMarkSpec,\n  IPyramid3dMarkSpec,\n  ILinkPathMarkSpec,\n  IRippleMarkSpec,\n  ICellMarkSpec,\n  ILiquidMarkSpec,\n  ConvertToMarkStyleSpec\n} from '../typings/visual';\n\nexport {\n  LineMark,\n  SymbolMark,\n  GroupMark,\n  RuleMark,\n  TextMark,\n  AreaMark,\n  Rect3dMark,\n  RectMark,\n  PathMark,\n  Arc3dMark,\n  ArcMark,\n  ComponentMark,\n  PolygonMark,\n  Pyramid3dMark,\n  RippleMark,\n  ImageMark,\n  BaseMark\n};\n\nexport {\n  registerLineMark,\n  registerSymbolMark,\n  registerGroupMark,\n  registerRuleMark,\n  registerTextMark,\n  registerAreaMark,\n  registerRectMark,\n  registerRect3dMark,\n  registerPathMark,\n  registerArcMark,\n  registerArc3dMark,\n  registerPolygonMark,\n  registerPyramid3dMark,\n  registerRippleMark,\n  registerImageMark,\n  registerComponentMark,\n  registerMarkMapTransform,\n  registerMarkFilterTransform\n};\n\nexport const registerAllMarks = () => {\n  registerGroupMark();\n  registerLineMark();\n  registerSymbolMark();\n  registerRuleMark();\n  registerTextMark();\n  registerAreaMark();\n  registerRectMark();\n  registerPathMark();\n  registerArcMark();\n  registerPolygonMark();\n  registerImageMark();\n  registerRippleMark();\n  registerComponentMark();\n  registerArc3dMark();\n  registerRect3dMark();\n  registerPyramid3dMark();\n};\n"]}