@visactor/vstory 0.0.4-alpha.2 → 0.0.5-alpha.0

package/es/story/character/chart/graphic/vchart-graphic.js

@@ -1,5 +1,9 @@
+import { Bounds } from "@visactor/vutils";
+
 import { genNumberType, Group } from "@visactor/vrender";
 
+import { isPointInBounds } from "../../../../util/space";
+
 export const CHART_NUMBER_TYPE = genNumberType();
 
 export class Chart extends Group {
@@ -9,9 +13,33 @@ export class Chart extends Group {
     get vProduct() {
         return this._vchart;
     }
+    _getVChartRootMarkBounds() {
+        return this._vchart.getStage().defaultLayer.getChildByName("root").AABBBounds.clone();
+    }
+    doUpdateAABBBounds(full) {
+        if (!this._vchart) return super.doUpdateAABBBounds();
+        const b = new Bounds;
+        return b.x1 = this.attribute.x, b.x2 = this.attribute.x + this.attribute.width, 
+        b.y1 = this.attribute.y, b.y2 = this.attribute.y + this.attribute.height, b;
+    }
     constructor(params) {
         var _a;
-        super(params), this.type = "chart", this.drawTag = !1, this.numberType = CHART_NUMBER_TYPE, 
+        super(params), this.type = "chart", this._globalViewBox = {
+            x1: 0,
+            y1: 0,
+            x2: 100,
+            y2: 100
+        }, this._localViewBox = {
+            x1: 0,
+            y1: 0,
+            x2: 100,
+            y2: 100
+        }, this._BoundsViewBox = {
+            x1: 0,
+            y1: 0,
+            x2: 100,
+            y2: 100
+        }, this.drawTag = !1, this._boundsChangeTag = !0, this.numberType = CHART_NUMBER_TYPE, 
         params.vchart ? this._vchart = params.vchart : params.vchart = this._vchart = new params.ClassType(params.spec, Object.assign({
             renderCanvas: params.renderCanvas,
             mode: params.mode,
@@ -35,25 +63,69 @@ export class Chart extends Group {
                 this._vchart && this.stage && (this._vchart.getStage()._editor_needRender = !1, 
                 this._vchart.getStage().stage.resumeRender());
             }
-        }, null !== (_a = params.chartInitOptions) && void 0 !== _a ? _a : {})), this._vchart.renderSync();
+        }, null !== (_a = params.chartInitOptions) && void 0 !== _a ? _a : {}));
         const stage = this._vchart.getStage();
-        stage && (stage.background = !1, stage.pauseTriggerEvent()), params.viewBox && this.updateViewBox(params.viewBox);
+        stage.stage.pauseRender(), this._vchart.renderSync(), stage.stage.resumeRender(), 
+        stage && (stage.background = !1), params.viewBox && this.updateViewBox(params.viewBox);
     }
-    updateSpec(spec, forceMerge = !1, morphConfig = !1) {
-        this._vchart.updateSpecSync(spec, forceMerge, morphConfig);
+    pointInVChart(canvasX, canvasY) {
+        const vchart = this._vchart;
+        if (!vchart) return !1;
+        const target = {
+            x: 0,
+            y: 0
+        };
+        return this.globalTransMatrix.transformPoint({
+            x: canvasX,
+            y: canvasY
+        }, target), isPointInBounds(target, vchart.getStage().viewBox);
+    }
+    pointInViewBox(canvasX, canvasY) {
+        const target = {
+            x: 0,
+            y: 0
+        };
+        return this.globalTransMatrix.transformPoint({
+            x: canvasX,
+            y: canvasY
+        }, target), isPointInBounds(target, this._localViewBox);
+    }
+    updateSpec(spec, viewBox, forceMerge = !1, morphConfig = !1) {
+        this._boundsChangeTag = !0, viewBox && this.updateViewBox(viewBox), this._vchart.updateSpecSync(spec, forceMerge, {
+            reuse: !1,
+            morph: morphConfig
+        }), this._updateViewBox();
     }
     updateViewBox(viewBox) {
-        this._updateViewBox(viewBox);
+        this._globalViewBox = Object.assign({}, viewBox), this._localViewBox = {
+            x1: 0,
+            y1: 0,
+            x2: viewBox.x2 - viewBox.x1,
+            y2: viewBox.y2 - viewBox.y1
+        }, this._updateViewBox();
     }
-    _updateViewBox(_viewBox) {
-        const viewBox = Object.assign({}, _viewBox);
+    _updateViewBox() {
+        if (!this._vchart) return;
+        this._boundsChangeTag = !0;
+        const rootBounds = this._getVChartRootMarkBounds();
+        this._vchart.getStage().defaultLayer.translateTo(-rootBounds.x1, -rootBounds.y1), 
+        this._BoundsViewBox = rootBounds;
+        const viewBox = Object.assign({}, this._globalViewBox);
         this.setAttributes({
-            x: viewBox.x1,
-            y: viewBox.y1,
-            width: viewBox.x2 - viewBox.x1,
-            height: viewBox.y2 - viewBox.y1
-        }), viewBox.x2 -= viewBox.x1, viewBox.y2 -= viewBox.y1, viewBox.x1 = 0, viewBox.y1 = 0, 
+            x: viewBox.x1 + rootBounds.x1,
+            y: viewBox.y1 + rootBounds.y1,
+            width: rootBounds.x2 - rootBounds.x1,
+            height: rootBounds.y2 - rootBounds.y1
+        }), this._localViewBox.x1 = -rootBounds.x1, this._localViewBox.y1 = -rootBounds.y1, 
+        this._localViewBox.x2 += -rootBounds.x1, this._localViewBox.y2 += -rootBounds.y1, 
+        viewBox.x2 -= viewBox.x1, viewBox.y2 -= viewBox.y1, viewBox.x1 = 0, viewBox.y1 = 0, 
         this._vchart.resize(viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1), this._vchart.updateViewBox(viewBox);
+        const renderViewBox = Object.assign({}, rootBounds);
+        renderViewBox.x2 -= renderViewBox.x1, renderViewBox.y2 -= renderViewBox.y1, renderViewBox.x1 = 0, 
+        renderViewBox.y1 = 0, this._vchart._compiler._view.renderer.setViewBox(renderViewBox, !0);
+    }
+    release() {
+        this._vchart && this._vchart.release();
     }
 }
 //# sourceMappingURL=vchart-graphic.js.map

package/es/story/character/chart/graphic/vchart-graphic.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/graphic/vchart-graphic.ts"],"names":[],"mappings":"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","file":"vchart-graphic.js","sourcesContent":["import type { IVisactorGraphic } from '../../visactor/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { ISpec, IVChart } from '@visactor/vchart';\nimport type { GraphicType, IGroupGraphicAttribute, ITicker } from '@visactor/vrender';\nimport { genNumberType, Group } from '@visactor/vrender';\n\nexport interface IChartGraphicAttribute extends IGroupGraphicAttribute {\n  renderCanvas: HTMLCanvasElement;\n  spec: any;\n  ClassType: any;\n  vchart: IVChart;\n  mode: string;\n  modeParams?: any;\n  dpr: number;\n  interactive: boolean;\n  animation: boolean;\n  disableTriggerEvent: boolean;\n  disableDirtyBounds: boolean;\n  viewBox: IBoundsLike;\n  ticker?: ITicker;\n  autoRender?: boolean;\n  chartInitOptions?: any;\n}\n\nexport const CHART_NUMBER_TYPE = genNumberType();\n\n// @ts-ignore\nexport class Chart extends Group implements IVisactorGraphic {\n  type: GraphicType = 'chart' as any;\n  declare attribute: IChartGraphicAttribute;\n  protected _vchart: IVChart;\n  get vchart() {\n    return this._vchart;\n  }\n  get vProduct() {\n    return this._vchart;\n  }\n\n  drawTag = false;\n\n  constructor(params: IChartGraphicAttribute) {\n    super(params);\n    this.numberType = CHART_NUMBER_TYPE;\n\n    // 创建chart\n    if (!params.vchart) {\n      params.vchart = this._vchart = new params.ClassType(params.spec, {\n        renderCanvas: params.renderCanvas,\n        mode: params.mode,\n        modeParams: params.modeParams,\n        canvasControled: false,\n        // viewBox: params.vi\n        dpr: params.dpr,\n        interactive: params.interactive,\n        animation: false,\n        autoFit: false,\n        disableTriggerEvent: params.disableTriggerEvent,\n        disableDirtyBounds: params.disableDirtyBounds,\n        ticker: params.ticker,\n        beforeRender: () => {\n          if (!this.stage) {\n            return;\n          }\n          const chartStage = this._vchart.getStage();\n          if (!(chartStage as any)._editor_needRender) {\n            chartStage.pauseRender();\n            this.stage.dirtyBounds?.union(this.globalAABBBounds);\n            this.stage.renderNextFrame();\n          }\n        },\n        afterRender: () => {\n          if (!this._vchart) {\n            return;\n          }\n          if (!this.stage) {\n            return;\n          }\n          // @ts-ignore\n          this._vchart.getStage()._editor_needRender = false;\n          this._vchart.getStage().stage.resumeRender();\n        },\n        ...(params.chartInitOptions ?? {})\n      });\n    } else {\n      this._vchart = params.vchart;\n    }\n    this._vchart.renderSync();\n    // 背景设置为false后，不会擦除画布内容，可以实现元素正常堆叠绘制\n    const stage = this._vchart.getStage();\n    if (stage) {\n      stage.background = false as any;\n      // 关闭交互\n      stage.pauseTriggerEvent();\n    }\n    if (params.viewBox) {\n      this.updateViewBox(params.viewBox);\n    }\n  }\n\n  updateSpec(spec: ISpec, forceMerge = false, morphConfig = false) {\n    this._vchart.updateSpecSync(spec, forceMerge, morphConfig as any);\n  }\n\n  updateViewBox(viewBox: IBoundsLike) {\n    this._updateViewBox(viewBox);\n  }\n\n  private _updateViewBox(_viewBox: IBoundsLike) {\n    const viewBox = { ..._viewBox };\n    this.setAttributes({\n      x: viewBox.x1,\n      y: viewBox.y1,\n      width: viewBox.x2 - viewBox.x1,\n      height: viewBox.y2 - viewBox.y1\n    });\n    //\n    viewBox.x2 -= viewBox.x1;\n    viewBox.y2 -= viewBox.y1;\n    viewBox.x1 = 0;\n    viewBox.y1 = 0;\n    this._vchart.resize(viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1);\n    this._vchart.updateViewBox(viewBox);\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/chart/graphic/vchart-graphic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAuD,MAAM,kBAAkB,CAAC;AAG/F,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAoBzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AAGjD,MAAM,OAAO,KAAM,SAAQ,KAAK;IAQ9B,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAWO,wBAAwB;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACtE,CAAC;IAED,kBAAkB,CAAC,IAAc;QAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO,KAAK,CAAC,kBAAkB,EAAE,CAAC;SACnC;QACD,MAAM,CAAC,GAAG,IAAI,MAAM,EAAE,CAAC;QACvB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;QAC/C,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAChD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,YAAY,MAA8B;;QACxC,KAAK,CAAC,MAAM,CAAC,CAAC;QAzChB,SAAI,GAAgB,OAAc,CAAC;QAe3B,mBAAc,GAAgB,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;QAEjE,kBAAa,GAAgB,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;QAChE,mBAAc,GAAgB,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;QAEzE,YAAO,GAAG,KAAK,CAAC;QACN,qBAAgB,GAAY,IAAI,CAAC;QAqBzC,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAAC;QAGpC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,kBAC7D,YAAY,EAAE,MAAM,CAAC,YAAY,EACjC,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,UAAU,EAAE,MAAM,CAAC,UAAU,EAC7B,eAAe,EAAE,KAAK,EAEtB,GAAG,EAAE,MAAM,CAAC,GAAG,EACf,WAAW,EAAE,MAAM,CAAC,WAAW,EAC/B,SAAS,EAAE,KAAK,EAChB,OAAO,EAAE,KAAK,EACd,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,EAC/C,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAC7C,MAAM,EAAE,MAAM,CAAC,MAAM,EACrB,YAAY,EAAE,GAAG,EAAE;;oBACjB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;wBACf,OAAO;qBACR;oBACD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBAC3C,IAAI,CAAE,UAAkB,CAAC,kBAAkB,EAAE;wBAC3C,UAAU,CAAC,WAAW,EAAE,CAAC;wBACzB,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,0CAAE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;wBACrD,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;qBAC9B;gBACH,CAAC,EACD,WAAW,EAAE,GAAG,EAAE;oBAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;wBACjB,OAAO;qBACR;oBACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;wBACf,OAAO;qBACR;oBAED,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,kBAAkB,GAAG,KAAK,CAAC;oBACnD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBAC/C,CAAC,IACE,CAAC,MAAA,MAAM,CAAC,gBAAgB,mCAAI,EAAE,CAAC,EAClC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;SAC9B;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAC1B,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAC3B,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,UAAU,GAAG,KAAY,CAAC;SAGjC;QACD,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACpC;IACH,CAAC;IAOD,aAAa,CAAC,OAAe,EAAE,OAAe;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,KAAK,CAAC;SACd;QACD,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QAE1E,OAAO,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAOD,cAAc,CAAC,OAAe,EAAE,OAAe;QAC7C,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QAC1E,OAAO,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACrD,CAAC;IAED,UAAU,CAAC,IAAW,EAAE,OAAqB,EAAE,UAAU,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK;QACpF,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,aAAa,CAAC,OAAoB;QAEhC,IAAI,CAAC,cAAc,qBAAQ,OAAO,CAAE,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;QAEhG,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;QAEjC,MAAM,OAAO,qBAAQ,IAAI,CAAC,cAAc,CAAE,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC;YACjB,CAAC,EAAE,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE;YAC7B,CAAC,EAAE,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE;YAC7B,KAAK,EAAE,UAAU,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE;YACpC,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAExC,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QACf,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,aAAa,qBAAQ,UAAU,CAAE,CAAC;QACxC,aAAa,CAAC,EAAE,IAAI,aAAa,CAAC,EAAE,CAAC;QACrC,aAAa,CAAC,EAAE,IAAI,aAAa,CAAC,EAAE,CAAC;QACrC,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;QACrB,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;QAErB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzC,CAAC;CACF","file":"vchart-graphic.js","sourcesContent":["import type { IVisactorGraphic } from '../../visactor/interface';\nimport { Bounds, type AABBBounds, type IAABBBounds, type IBoundsLike } from '@visactor/vutils';\nimport type { ISpec, IVChart } from '@visactor/vchart';\nimport type { GraphicType, IGroupGraphicAttribute, ITicker } from '@visactor/vrender';\nimport { genNumberType, Group } from '@visactor/vrender';\nimport { isPointInBounds } from '../../../../util/space';\n\nexport interface IChartGraphicAttribute extends IGroupGraphicAttribute {\n  renderCanvas: HTMLCanvasElement;\n  spec: any;\n  ClassType: any;\n  vchart: IVChart;\n  mode: string;\n  modeParams?: any;\n  dpr: number;\n  interactive: boolean;\n  animation: boolean;\n  disableTriggerEvent: boolean;\n  disableDirtyBounds: boolean;\n  viewBox: IBoundsLike;\n  ticker?: ITicker;\n  autoRender?: boolean;\n  chartInitOptions?: any;\n}\n\nexport const CHART_NUMBER_TYPE = genNumberType();\n\n// @ts-ignore\nexport class Chart extends Group implements IVisactorGraphic {\n  type: GraphicType = 'chart' as any;\n  declare attribute: IChartGraphicAttribute;\n  protected _vchart: IVChart;\n  // 是否试一次空render，目的是只生成场景树，不会真实渲染\n  // protected _emptyRenderCall: boolean;\n  protected declare _AABBBounds: AABBBounds;\n  declare valid: boolean;\n  get vchart() {\n    return this._vchart;\n  }\n  get vProduct() {\n    return this._vchart;\n  }\n\n  // 设置的 viewBox 是全局值\n  private _globalViewBox: IBoundsLike = { x1: 0, y1: 0, x2: 100, y2: 100 };\n  // 设置的 viewBox 相对于 vchart-graphic 的位置\n  private _localViewBox: IBoundsLike = { x1: 0, y1: 0, x2: 100, y2: 100 };\n  private _BoundsViewBox: IBoundsLike = { x1: 0, y1: 0, x2: 100, y2: 100 };\n\n  drawTag = false;\n  protected _boundsChangeTag: boolean = true;\n\n  private _getVChartRootMarkBounds() {\n    const stage = this._vchart.getStage();\n    return stage.defaultLayer.getChildByName('root').AABBBounds.clone();\n  }\n\n  doUpdateAABBBounds(full?: boolean): IAABBBounds {\n    if (!this._vchart) {\n      return super.doUpdateAABBBounds();\n    }\n    const b = new Bounds();\n    b.x1 = this.attribute.x;\n    b.x2 = this.attribute.x + this.attribute.width;\n    b.y1 = this.attribute.y;\n    b.y2 = this.attribute.y + this.attribute.height;\n    return b;\n  }\n\n  constructor(params: IChartGraphicAttribute) {\n    super(params);\n    this.numberType = CHART_NUMBER_TYPE;\n\n    // 创建chart\n    if (!params.vchart) {\n      params.vchart = this._vchart = new params.ClassType(params.spec, {\n        renderCanvas: params.renderCanvas,\n        mode: params.mode,\n        modeParams: params.modeParams,\n        canvasControled: false,\n        // viewBox: params.vi\n        dpr: params.dpr,\n        interactive: params.interactive,\n        animation: false,\n        autoFit: false,\n        disableTriggerEvent: params.disableTriggerEvent,\n        disableDirtyBounds: params.disableDirtyBounds,\n        ticker: params.ticker,\n        beforeRender: () => {\n          if (!this.stage) {\n            return;\n          }\n          const chartStage = this._vchart.getStage();\n          if (!(chartStage as any)._editor_needRender) {\n            chartStage.pauseRender();\n            this.stage.dirtyBounds?.union(this.globalAABBBounds);\n            this.stage.renderNextFrame();\n          }\n        },\n        afterRender: () => {\n          if (!this._vchart) {\n            return;\n          }\n          if (!this.stage) {\n            return;\n          }\n          // @ts-ignore\n          this._vchart.getStage()._editor_needRender = false;\n          this._vchart.getStage().stage.resumeRender();\n        },\n        ...(params.chartInitOptions ?? {})\n      });\n    } else {\n      this._vchart = params.vchart;\n    }\n    // 背景设置为false后，不会擦除画布内容，可以实现元素正常堆叠绘制\n    const stage = this._vchart.getStage();\n    stage.stage.pauseRender();\n    this._vchart.renderSync();\n    stage.stage.resumeRender();\n    if (stage) {\n      stage.background = false as any;\n      // 关闭交互\n      // stage.pauseTriggerEvent();\n    }\n    if (params.viewBox) {\n      this.updateViewBox(params.viewBox);\n    }\n  }\n\n  /**\n   * 判定点是否在VChart中，可能点在Character里，但不在VChart里\n   * @param canvasX\n   * @param canvasY\n   */\n  pointInVChart(canvasX: number, canvasY: number): boolean {\n    const vchart = this._vchart;\n    if (!vchart) {\n      return false;\n    }\n    const target = { x: 0, y: 0 };\n    this.globalTransMatrix.transformPoint({ x: canvasX, y: canvasY }, target);\n    // 判断点是否在viewBox中\n    return isPointInBounds(target, vchart.getStage().viewBox);\n  }\n\n  /**\n   * 判定点是否在设置 viewBox 内。设置 viewBox 会小于展示 bounds\n   * @param canvasX\n   * @param canvasY\n   */\n  pointInViewBox(canvasX: number, canvasY: number): boolean {\n    const target = { x: 0, y: 0 };\n    this.globalTransMatrix.transformPoint({ x: canvasX, y: canvasY }, target);\n    return isPointInBounds(target, this._localViewBox);\n  }\n\n  updateSpec(spec: ISpec, viewBox?: IBoundsLike, forceMerge = false, morphConfig = false) {\n    this._boundsChangeTag = true;\n    viewBox && this.updateViewBox(viewBox);\n    this._vchart.updateSpecSync(spec, forceMerge, { reuse: false, morph: morphConfig });\n    this._updateViewBox();\n  }\n\n  updateViewBox(viewBox: IBoundsLike) {\n    // 图表的设置大小\n    this._globalViewBox = { ...viewBox };\n    this._localViewBox = { x1: 0, y1: 0, x2: viewBox.x2 - viewBox.x1, y2: viewBox.y2 - viewBox.y1 };\n\n    this._updateViewBox();\n  }\n\n  private _updateViewBox() {\n    if (!this._vchart) {\n      return;\n    }\n    this._boundsChangeTag = true;\n    const rootBounds = this._getVChartRootMarkBounds();\n    this._vchart.getStage().defaultLayer.translateTo(-rootBounds.x1, -rootBounds.y1);\n    this._BoundsViewBox = rootBounds;\n\n    const viewBox = { ...this._globalViewBox };\n    this.setAttributes({\n      x: viewBox.x1 + rootBounds.x1,\n      y: viewBox.y1 + rootBounds.y1,\n      width: rootBounds.x2 - rootBounds.x1,\n      height: rootBounds.y2 - rootBounds.y1\n    });\n    // viewBox 在展示 bounds 下的位置\n    this._localViewBox.x1 = -rootBounds.x1;\n    this._localViewBox.y1 = -rootBounds.y1;\n    this._localViewBox.x2 += -rootBounds.x1;\n    this._localViewBox.y2 += -rootBounds.y1;\n    //\n    viewBox.x2 -= viewBox.x1;\n    viewBox.y2 -= viewBox.y1;\n    viewBox.x1 = 0;\n    viewBox.y1 = 0;\n    this._vchart.resize(viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1);\n    this._vchart.updateViewBox(viewBox);\n    const renderViewBox = { ...rootBounds };\n    renderViewBox.x2 -= renderViewBox.x1;\n    renderViewBox.y2 -= renderViewBox.y1;\n    renderViewBox.x1 = 0;\n    renderViewBox.y1 = 0;\n    // @ts-ignore\n    this._vchart._compiler._view.renderer.setViewBox(renderViewBox, true);\n  }\n\n  release() {\n    this._vchart && this._vchart.release();\n  }\n}\n"]}

package/es/story/character/chart/runtime/common-spec.d.ts

@@ -1,10 +1,8 @@
-import { CharacterChart } from '../character';
-import { IChartCharacterRuntime } from './interface';
+import type { CharacterChart } from '../character';
+import type { IChartCharacterRuntime } from './interface';
 export declare class CommonSpecRuntime implements IChartCharacterRuntime {
     type: string;
     protected _character: CharacterChart;
     constructor(character: CharacterChart);
     onSpecReady(): void;
-    afterInitializeChart(): void;
-    afterVRenderDraw(): void;
 }

package/es/story/character/chart/runtime/common-spec.js

@@ -13,7 +13,5 @@ export class CommonSpecRuntime {
             title: options.title
         });
     }
-    afterInitializeChart() {}
-    afterVRenderDraw() {}
 }
 //# sourceMappingURL=common-spec.js.map

package/es/story/character/chart/runtime/common-spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/runtime/common-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,MAAM,OAAO,iBAAiB;IAK5B,YAAY,SAAyB;QAJrC,SAAI,GAAG,YAAY,CAAC;QAKlB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC;QACvE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACjH,CAAC;IAED,oBAAoB;IAEpB,CAAC;IACD,gBAAgB,KAAI,CAAC;CACtB","file":"common-spec.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport { CharacterChart } from '../character';\nimport { IChartCharacterRuntime } from './interface';\n\nexport class CommonSpecRuntime implements IChartCharacterRuntime {\n  type = 'CommonSpec';\n\n  protected declare _character: CharacterChart;\n\n  constructor(character: CharacterChart) {\n    this._character = character;\n  }\n\n  onSpecReady() {\n    const rawSpec = this._character.specProcess.getVisSpec();\n    const options = this._character.specProcess.getCharacterSpec().options;\n    if (!options) {\n      return;\n    }\n    merge(rawSpec, { color: options.color, theme: options.theme, padding: options.padding, title: options.title });\n  }\n\n  afterInitializeChart() {\n    //\n  }\n  afterVRenderDraw() {}\n}\n"]}
+{"version":3,"sources":["../src/story/character/chart/runtime/common-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,MAAM,OAAO,iBAAiB;IAK5B,YAAY,SAAyB;QAJrC,SAAI,GAAG,YAAY,CAAC;QAKlB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC;QACvE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACjH,CAAC;CACF","file":"common-spec.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport type { CharacterChart } from '../character';\nimport type { IChartCharacterRuntime } from './interface';\n\nexport class CommonSpecRuntime implements IChartCharacterRuntime {\n  type = 'CommonSpec';\n\n  protected declare _character: CharacterChart;\n\n  constructor(character: CharacterChart) {\n    this._character = character;\n  }\n\n  onSpecReady() {\n    const rawSpec = this._character.specProcess.getVisSpec();\n    const options = this._character.specProcess.getCharacterSpec().options;\n    if (!options) {\n      return;\n    }\n    merge(rawSpec, { color: options.color, theme: options.theme, padding: options.padding, title: options.title });\n  }\n}\n"]}

package/es/story/character/chart/runtime/component-spec.d.ts

@@ -1,12 +1,13 @@
-import { IComponentSpec } from '../../dsl-interface';
-import { CharacterChart } from '../character';
-import { IChartCharacterRuntime } from './interface';
+import type { IComponentSpec } from '../../dsl-interface';
+import type { CharacterChart } from '../character';
+import type { IChartCharacterRuntime } from './interface';
 export declare class ComponentSpecRuntime implements IChartCharacterRuntime {
     type: string;
     protected _character: CharacterChart;
     constructor(character: CharacterChart);
     onSpecReady(): void;
     protected _mergeAxesSpec(rawSpec: any, componentSpec: IComponentSpec): void;
+    protected _mergeComponentSpec(rawSpec: any, componentSpec: IComponentSpec, key: string, additionalMatch?: (rawComponentSpec: any, index: number, componentSpec: IComponentSpec) => boolean): void;
     afterInitializeChart(): void;
     afterVRenderDraw(): void;
 }

package/es/story/character/chart/runtime/component-spec.js

@@ -11,14 +11,16 @@ export class ComponentSpecRuntime {
         if (!options) return;
         const componentSpec = options.componentSpec;
         null == componentSpec || componentSpec.forEach((cSpec => {
-            "axes" === cSpec.specKey && this._mergeAxesSpec(rawSpec, cSpec);
+            "axes" === cSpec.specKey ? this._mergeAxesSpec(rawSpec, cSpec) : this._mergeComponentSpec(rawSpec, cSpec, cSpec.specKey);
         }));
     }
     _mergeAxesSpec(rawSpec, componentSpec) {
-        if (rawSpec.axes) {
-            const s = rawSpec.axes.find(((a, index) => !!ChartSpecMatch(a, index, componentSpec.matchInfo) || a.orient === componentSpec.matchInfo.orient));
-            s ? merge(s, componentSpec.spec) : rawSpec.axes.push(componentSpec.spec);
-        } else rawSpec.axes = [ Object.assign({}, componentSpec) ];
+        this._mergeComponentSpec(rawSpec, componentSpec, "axes", ((a, index, _componentSpec) => a.orient === componentSpec.matchInfo.orient));
+    }
+    _mergeComponentSpec(rawSpec, componentSpec, key, additionalMatch) {
+        rawSpec[key] || (rawSpec[key] = []);
+        const s = rawSpec[key].find(((a, index) => !!ChartSpecMatch(a, index, componentSpec.matchInfo) || !!additionalMatch && additionalMatch(a, index, componentSpec)));
+        s ? merge(s, componentSpec.spec) : rawSpec[key].push(componentSpec.spec);
     }
     afterInitializeChart() {}
     afterVRenderDraw() {}

package/es/story/character/chart/runtime/component-spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/runtime/component-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,MAAM,OAAO,oBAAoB;IAK/B,YAAY,SAAyB;QAJrC,SAAI,GAAG,eAAe,CAAC;QAKrB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC;QACvE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC5B,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACrC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,cAAc,CAAC,OAAY,EAAE,aAA6B;QAClE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,IAAI,GAAG,mBAAM,aAAa,EAAG,CAAC;YACtC,OAAO;SACR;aAAM;YACL,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;gBACpD,IAAI,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE;oBACrD,OAAO,IAAI,CAAC;iBACb;qBAAM;oBACL,OAAO,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC;iBACpD;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,EAAE;gBACL,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;aAC9B;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAED,oBAAoB;IAEpB,CAAC;IACD,gBAAgB,KAAI,CAAC;CACtB","file":"component-spec.js","sourcesContent":["import { merge, isValid } from '@visactor/vutils';\nimport { IComponentSpec } from '../../dsl-interface';\nimport { CharacterChart } from '../character';\nimport { IChartCharacterRuntime } from './interface';\nimport { ChartSpecMatch } from './utils';\n\nexport class ComponentSpecRuntime implements IChartCharacterRuntime {\n  type = 'ComponentSpec';\n\n  protected declare _character: CharacterChart;\n\n  constructor(character: CharacterChart) {\n    this._character = character;\n  }\n\n  onSpecReady() {\n    const rawSpec = this._character.specProcess.getVisSpec();\n    const options = this._character.specProcess.getCharacterSpec().options;\n    if (!options) {\n      return;\n    }\n    const componentSpec = options.componentSpec;\n    componentSpec?.forEach(cSpec => {\n      if (cSpec.specKey === 'axes') {\n        this._mergeAxesSpec(rawSpec, cSpec);\n      }\n    });\n  }\n\n  protected _mergeAxesSpec(rawSpec: any, componentSpec: IComponentSpec) {\n    if (!rawSpec.axes) {\n      rawSpec.axes = [{ ...componentSpec }];\n      return;\n    } else {\n      const s = rawSpec.axes.find((a: any, index: number) => {\n        if (ChartSpecMatch(a, index, componentSpec.matchInfo)) {\n          return true;\n        } else {\n          return a.orient === componentSpec.matchInfo.orient;\n        }\n      });\n      if (s) {\n        merge(s, componentSpec.spec);\n      } else {\n        rawSpec.axes.push(componentSpec.spec);\n      }\n    }\n  }\n\n  afterInitializeChart() {\n    //\n  }\n  afterVRenderDraw() {}\n}\n"]}
+{"version":3,"sources":["../src/story/character/chart/runtime/component-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,MAAM,OAAO,oBAAoB;IAK/B,YAAY,SAAyB;QAJrC,SAAI,GAAG,eAAe,CAAC;QAKrB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC;QACvE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC5B,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACrC;iBAAM;gBACL,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;aACzD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,cAAc,CAAC,OAAY,EAAE,aAA6B;QAClE,IAAI,CAAC,mBAAmB,CACtB,OAAO,EACP,aAAa,EACb,MAAM,EACN,CAAC,CAAM,EAAE,KAAa,EAAE,cAA8B,EAAE,EAAE;YACxD,OAAO,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC;QACrD,CAAC,CACF,CAAC;IACJ,CAAC;IAES,mBAAmB,CAC3B,OAAY,EACZ,aAA6B,EAC7B,GAAW,EACX,eAAkG;QAElG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;SACnB;QACD,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;YACpD,IAAI,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE;gBACrD,OAAO,IAAI,CAAC;aACb;YACD,IAAI,eAAe,EAAE;gBACnB,OAAO,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;aACjD;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE;YACL,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;SAC9B;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;IAED,oBAAoB;IAEpB,CAAC;IACD,gBAAgB;IAEhB,CAAC;CACF","file":"component-spec.js","sourcesContent":["import { merge, isValid } from '@visactor/vutils';\nimport type { IComponentSpec } from '../../dsl-interface';\nimport type { CharacterChart } from '../character';\nimport type { IChartCharacterRuntime } from './interface';\nimport { ChartSpecMatch } from './utils';\n\nexport class ComponentSpecRuntime implements IChartCharacterRuntime {\n  type = 'ComponentSpec';\n\n  protected declare _character: CharacterChart;\n\n  constructor(character: CharacterChart) {\n    this._character = character;\n  }\n\n  onSpecReady() {\n    const rawSpec = this._character.specProcess.getVisSpec();\n    const options = this._character.specProcess.getCharacterSpec().options;\n    if (!options) {\n      return;\n    }\n    const componentSpec = options.componentSpec;\n    componentSpec?.forEach(cSpec => {\n      if (cSpec.specKey === 'axes') {\n        this._mergeAxesSpec(rawSpec, cSpec);\n      } else {\n        this._mergeComponentSpec(rawSpec, cSpec, cSpec.specKey);\n      }\n    });\n  }\n\n  protected _mergeAxesSpec(rawSpec: any, componentSpec: IComponentSpec) {\n    this._mergeComponentSpec(\n      rawSpec,\n      componentSpec,\n      'axes',\n      (a: any, index: number, _componentSpec: IComponentSpec) => {\n        return a.orient === componentSpec.matchInfo.orient;\n      }\n    );\n  }\n\n  protected _mergeComponentSpec(\n    rawSpec: any,\n    componentSpec: IComponentSpec,\n    key: string,\n    additionalMatch?: (rawComponentSpec: any, index: number, componentSpec: IComponentSpec) => boolean\n  ) {\n    if (!rawSpec[key]) {\n      rawSpec[key] = [];\n    }\n    const s = rawSpec[key].find((a: any, index: number) => {\n      if (ChartSpecMatch(a, index, componentSpec.matchInfo)) {\n        return true;\n      }\n      if (additionalMatch) {\n        return additionalMatch(a, index, componentSpec);\n      }\n      return false;\n    });\n    if (s) {\n      merge(s, componentSpec.spec);\n    } else {\n      rawSpec[key].push(componentSpec.spec);\n    }\n  }\n\n  afterInitializeChart() {\n    //\n  }\n  afterVRenderDraw() {\n    //\n  }\n}\n"]}

package/es/story/character/chart/temp/constant.d.ts

@@ -1,4 +1,5 @@
 import { StoryChartType } from '../../../../constants/character';
 export declare const TemplateChartType: {
     vchart: StoryChartType;
+    rankingBar: StoryChartType;
 };

package/es/story/character/chart/temp/constant.js

@@ -1,4 +1,5 @@
 export const TemplateChartType = {
-    vchart: "VChart"
+    vchart: "VChart",
+    rankingBar: "RankingBar"
 };
 //# sourceMappingURL=constant.js.map

package/es/story/character/chart/temp/constant.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/temp/constant.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,MAAM,UAAuB;CAC9B,CAAC","file":"constant.js","sourcesContent":["import { StoryChartType } from '../../../../constants/character';\n\nexport const TemplateChartType = {\n  vchart: StoryChartType.VCHART\n};\n"]}
+{"version":3,"sources":["../src/story/character/chart/temp/constant.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,MAAM,UAAuB;IAC7B,UAAU,cAA2B;CACtC,CAAC","file":"constant.js","sourcesContent":["import { StoryChartType } from '../../../../constants/character';\n\nexport const TemplateChartType = {\n  vchart: StoryChartType.VCHART,\n  rankingBar: StoryChartType.RANKINGBAR\n};\n"]}

package/es/story/character/chart/temp/templates/bar.d.ts

@@ -0,0 +1,20 @@
+import type { CharacterChart } from '../../character';
+import { BaseTemp } from './base-temp';
+import type { StandardData, DataInfo } from '../../data/interface';
+export declare class BarTemp extends BaseTemp {
+    getSpec(data: StandardData, ctx: {
+        character: CharacterChart;
+    }, opt?: any): void;
+    checkDataEnable(data: StandardData, info: DataInfo, opt?: any): boolean;
+    static type: string;
+    type: string;
+    seriesType: string;
+    defaultTotalLabel: boolean;
+    protected _getSeriesSpec(): {
+        type: string;
+        stack: boolean;
+    };
+    afterInitializeChart(ctx: {
+        character: CharacterChart;
+    }): void;
+}

package/es/story/character/chart/temp/templates/bar.js

@@ -0,0 +1,27 @@
+import { TemplateChartType } from "../constant";
+
+import { BaseTemp } from "./base-temp";
+
+export class BarTemp extends BaseTemp {
+    constructor() {
+        super(...arguments), this.type = BarTemp.type, this.seriesType = "bar", this.defaultTotalLabel = !0;
+    }
+    getSpec(data, ctx, opt) {
+        throw new Error("Method not implemented.");
+    }
+    checkDataEnable(data, info, opt) {
+        throw new Error("Method not implemented.");
+    }
+    _getSeriesSpec() {
+        return {
+            type: "bar",
+            stack: !0
+        };
+    }
+    afterInitializeChart(ctx) {
+        console.log("afterInitializeChart");
+    }
+}
+
+BarTemp.type = TemplateChartType.vchart;
+//# sourceMappingURL=bar.js.map

package/es/story/character/chart/temp/templates/bar.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/story/character/chart/temp/templates/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,MAAM,OAAO,OAAQ,SAAQ,QAAQ;IAArC;;QAQE,SAAI,GAAW,OAAO,CAAC,IAAI,CAAC;QAE5B,eAAU,GAAG,KAAK,CAAC;QAEnB,sBAAiB,GAAG,IAAI,CAAC;IAa3B,CAAC;IAxBC,OAAO,CAAC,IAAkB,EAAE,GAAkC,EAAE,GAAS;QACvE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,eAAe,CAAC,IAAkB,EAAE,IAAc,EAAE,GAAS;QAC3D,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAQS,cAAc;QACtB,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,IAAI;SACZ,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,GAAkC;QAErD,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC;;AAjBM,YAAI,GAAW,iBAAiB,CAAC,MAAM,CAAC","file":"bar.js","sourcesContent":["import { TemplateChartType } from '../constant';\nimport type { CharacterChart } from '../../character';\nimport { BaseTemp } from './base-temp';\nimport type { StandardData, DataInfo } from '../../data/interface';\n\nexport class BarTemp extends BaseTemp {\n  getSpec(data: StandardData, ctx: { character: CharacterChart }, opt?: any) {\n    throw new Error('Method not implemented.');\n  }\n  checkDataEnable(data: StandardData, info: DataInfo, opt?: any): boolean {\n    throw new Error('Method not implemented.');\n  }\n  static type: string = TemplateChartType.vchart;\n  type: string = BarTemp.type;\n  // 唯一系列类型\n  seriesType = 'bar';\n  // 默认是否展示总计标签\n  defaultTotalLabel = true;\n\n  protected _getSeriesSpec() {\n    return {\n      type: 'bar',\n      stack: true\n    };\n  }\n\n  afterInitializeChart(ctx: { character: CharacterChart }): void {\n    // eslint-disable-next-line no-console\n    console.log('afterInitializeChart');\n  }\n}\n"]}

package/es/story/character/chart/temp/templates/base-temp.d.ts

@@ -1,6 +1,6 @@
-import { IChartTemp } from '../interface';
-import { DataInfo, StandardData } from '../../data/interface';
-import { CharacterChart } from '../../character';
+import type { IChartTemp } from '../interface';
+import type { DataInfo, StandardData } from '../../data/interface';
+import type { CharacterChart } from '../../character';
 export declare const EDITOR_SERIES_MARK_SINGLE = "_editor_series_mark_single";
 export declare const EDITOR_SERIES_MARK_SINGLE_LEVEL = 100;
 export declare abstract class BaseTemp implements IChartTemp {
@@ -11,7 +11,9 @@ export declare abstract class BaseTemp implements IChartTemp {
     abstract checkDataEnable(data: StandardData, info: DataInfo, opt?: any): boolean;
     clear(): void;
     getChartType(): string;
-    afterInitializeChart(): void;
+    afterInitializeChart(ctx: {
+        character: CharacterChart;
+    }): void;
     standardizedSpec(spec: any, ctx: {
         character: CharacterChart;
     }): void;

package/es/story/character/chart/temp/templates/base-temp.js

@@ -7,7 +7,7 @@ export class BaseTemp {
     getChartType() {
         return this.type;
     }
-    afterInitializeChart() {}
+    afterInitializeChart(ctx) {}
     standardizedSpec(spec, ctx) {}
 }
 //# sourceMappingURL=base-temp.js.map

package/es/story/character/chart/temp/templates/base-temp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/temp/templates/base-temp.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AACtE,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD,MAAM,OAAgB,QAAQ;IAI5B,KAAK;IAEL,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,oBAAoB;IAEpB,CAAC;IAED,gBAAgB,CAAC,IAAS,EAAE,GAAkC;IAE9D,CAAC;CACF","file":"base-temp.js","sourcesContent":["import { IChartTemp } from '../interface';\nimport { DataInfo, StandardData } from '../../data/interface';\nimport { CharacterChart } from '../../character';\n\nexport const EDITOR_SERIES_MARK_SINGLE = '_editor_series_mark_single';\nexport const EDITOR_SERIES_MARK_SINGLE_LEVEL = 100;\n\nexport abstract class BaseTemp implements IChartTemp {\n  type: string;\n  abstract getSpec(data: StandardData, ctx: { character: CharacterChart }, opt?: any): any;\n  abstract checkDataEnable(data: StandardData, info: DataInfo, opt?: any): boolean;\n  clear() {\n    // do nothing\n  }\n\n  getChartType() {\n    return this.type;\n  }\n\n  afterInitializeChart() {\n    // do nothing\n  }\n\n  standardizedSpec(spec: any, ctx: { character: CharacterChart }) {\n    // do nothing\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/chart/temp/templates/base-temp.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AACtE,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD,MAAM,OAAgB,QAAQ;IAI5B,KAAK;IAEL,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,oBAAoB,CAAC,GAAkC;IAEvD,CAAC;IAED,gBAAgB,CAAC,IAAS,EAAE,GAAkC;IAE9D,CAAC;CACF","file":"base-temp.js","sourcesContent":["import type { IChartTemp } from '../interface';\nimport type { DataInfo, StandardData } from '../../data/interface';\nimport type { CharacterChart } from '../../character';\n\nexport const EDITOR_SERIES_MARK_SINGLE = '_editor_series_mark_single';\nexport const EDITOR_SERIES_MARK_SINGLE_LEVEL = 100;\n\nexport abstract class BaseTemp implements IChartTemp {\n  type: string;\n  abstract getSpec(data: StandardData, ctx: { character: CharacterChart }, opt?: any): any;\n  abstract checkDataEnable(data: StandardData, info: DataInfo, opt?: any): boolean;\n  clear() {\n    // do nothing\n  }\n\n  getChartType() {\n    return this.type;\n  }\n\n  afterInitializeChart(ctx: { character: CharacterChart }) {\n    // do nothing\n  }\n\n  standardizedSpec(spec: any, ctx: { character: CharacterChart }) {\n    // do nothing\n  }\n}\n"]}

package/es/story/character/chart/temp/templates/ranking-bar-temp.d.ts

@@ -0,0 +1,8 @@
+import type { StandardData } from '../../data/interface';
+import { BaseTemp } from './base-temp';
+export declare class RankingBarTemp extends BaseTemp {
+    static type: string;
+    type: string;
+    checkDataEnable(data: StandardData, opt?: any): boolean;
+    getSpec(data: StandardData, opt: any): any;
+}

package/es/story/character/chart/temp/templates/ranking-bar-temp.js

@@ -0,0 +1,18 @@
+import { BaseTemp } from "./base-temp";
+
+import { TemplateChartType } from "../constant";
+
+export class RankingBarTemp extends BaseTemp {
+    constructor() {
+        super(...arguments), this.type = RankingBarTemp.type;
+    }
+    checkDataEnable(data, opt) {
+        return !0;
+    }
+    getSpec(data, opt) {
+        return opt.character.spec.options.spec;
+    }
+}
+
+RankingBarTemp.type = TemplateChartType.rankingBar;
+//# sourceMappingURL=ranking-bar-temp.js.map

package/es/story/character/chart/temp/templates/ranking-bar-temp.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/story/character/chart/temp/templates/ranking-bar-temp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,OAAO,cAAe,SAAQ,QAAQ;IAA5C;;QAEE,SAAI,GAAW,cAAc,CAAC,IAAI,CAAC;IAQrC,CAAC;IAPC,eAAe,CAAC,IAAkB,EAAE,GAAS;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CAAC,IAAkB,EAAE,GAAQ;QAElC,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAW,CAAC;IAChD,CAAC;;AARM,mBAAI,GAAW,iBAAiB,CAAC,UAAU,CAAC","file":"ranking-bar-temp.js","sourcesContent":["import type { StandardData } from '../../data/interface';\nimport { BaseTemp } from './base-temp';\nimport { TemplateChartType } from '../constant';\n\nexport class RankingBarTemp extends BaseTemp {\n  static type: string = TemplateChartType.rankingBar;\n  type: string = RankingBarTemp.type;\n  checkDataEnable(data: StandardData, opt?: any): boolean {\n    return true;\n  }\n  getSpec(data: StandardData, opt: any) {\n    // TODO 转换特定chart Spec到通用common spec\n    return opt.character.spec.options.spec as any;\n  }\n}\n"]}

package/es/story/character/component/character-group/component-group-graphic-render.d.ts

@@ -1,7 +1,7 @@
 import type { IDrawContext, IGraphicRender, IGraphicRenderDrawParams, IRenderService, IGroup } from '@visactor/vrender';
 import { DefaultCanvasGroupRender } from '@visactor/vrender';
-export declare const ChartRender: unique symbol;
-export declare const ChartRenderContribution: unique symbol;
+export declare const ComponentRender: unique symbol;
+export declare const ComponentRenderContribution: unique symbol;
 export declare class ComponentGroupRender extends DefaultCanvasGroupRender implements IGraphicRender {
     type: any;
     numberType: number;

package/es/story/character/component/character-group/component-group-graphic-render.js

@@ -6,17 +6,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { injectable, DefaultCanvasGroupRender } from "@visactor/vrender";
 
-import { CHART_NUMBER_TYPE } from "./component-group-graphic";
+import { COMPONENT_NUMBER_TYPE } from "./component-group-graphic";
 
 import { Direction } from "../../../../constants/config";
 
-export const ChartRender = Symbol.for("ChartRender");
+export const ComponentRender = Symbol.for("VStoryComponentRender");
 
-export const ChartRenderContribution = Symbol.for("ChartRenderContribution");
+export const ComponentRenderContribution = Symbol.for("VStoryComponentRenderContribution");
 
 let ComponentGroupRender = class extends DefaultCanvasGroupRender {
     constructor() {
-        super(...arguments), this.type = "vstory-component-group", this.numberType = CHART_NUMBER_TYPE;
+        super(...arguments), this.type = "vstory-component-group", this.numberType = COMPONENT_NUMBER_TYPE;
     }
     draw(group, renderService, drawContext, params) {
         const {context: context} = drawContext;

package/es/story/character/component/character-group/component-group-graphic-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/character-group/component-group-graphic-render.ts"],"names":[],"mappings":"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","file":"component-group-graphic-render.js","sourcesContent":["import type {\n  IContext2d,\n  IDrawContext,\n  IGraphicAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IMarkAttribute,\n  IRenderService,\n  IThemeAttribute,\n  IGraphic,\n  IGroup\n} from '@visactor/vrender';\nimport { injectable, DefaultCanvasGroupRender } from '@visactor/vrender';\nimport { CHART_NUMBER_TYPE } from './component-group-graphic';\nimport { Direction } from '../../../../constants/config';\n\nexport const ChartRender = Symbol.for('ChartRender');\nexport const ChartRenderContribution = Symbol.for('ChartRenderContribution');\n\n@injectable()\nexport class ComponentGroupRender extends DefaultCanvasGroupRender implements IGraphicRender {\n  type: any = 'vstory-component-group';\n  numberType: number = CHART_NUMBER_TYPE;\n\n  draw(group: IGroup, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    const { wipeDirection, wipeRatio, wipeColor, wipeBlur } = group.attribute as any;\n    const drawWipe = isFinite(wipeRatio);\n    let x1;\n    let y1;\n    let x2;\n    let y2;\n    if (drawWipe) {\n      const b = group.AABBBounds;\n      if (wipeDirection === Direction.LEFT_TO_RIGHT) {\n        x1 = b.x1;\n        y1 = b.y1;\n        x2 = x1 + b.width() * wipeRatio;\n        y2 = b.height() + y1;\n      } else if (wipeDirection === Direction.RIGHT_TO_LEFT) {\n        x2 = b.x1;\n        y1 = b.y1;\n        x1 = x2 - b.width() * wipeRatio;\n        y2 = b.height() + y1;\n      } else if (wipeDirection === Direction.TOP_TO_BOTTOM) {\n        x1 = b.x1;\n        y1 = b.y1;\n        x2 = x1 + b.width();\n        y2 = b.height() * wipeRatio + y1;\n      } else if (wipeDirection === Direction.BOTTOM_TO_TOP) {\n        x1 = b.x1;\n        y2 = b.y1;\n        x2 = x1 + b.width();\n        y1 = y2 - b.height() * wipeRatio;\n      }\n      context.save();\n      context.setTransformForCurrent();\n      context.beginPath();\n      context.rect(x1, y1, x2 - x1, y2 - y1);\n      context.clip();\n    }\n    super.draw(group, renderService, drawContext, params);\n    if (drawWipe) {\n      context.restore();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/character-group/component-group-graphic-render.ts"],"names":[],"mappings":"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","file":"component-group-graphic-render.js","sourcesContent":["import type {\n  IContext2d,\n  IDrawContext,\n  IGraphicAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IMarkAttribute,\n  IRenderService,\n  IThemeAttribute,\n  IGraphic,\n  IGroup\n} from '@visactor/vrender';\nimport { injectable, DefaultCanvasGroupRender } from '@visactor/vrender';\nimport { COMPONENT_NUMBER_TYPE } from './component-group-graphic';\nimport { Direction } from '../../../../constants/config';\n\nexport const ComponentRender = Symbol.for('VStoryComponentRender');\nexport const ComponentRenderContribution = Symbol.for('VStoryComponentRenderContribution');\n\n@injectable()\nexport class ComponentGroupRender extends DefaultCanvasGroupRender implements IGraphicRender {\n  type: any = 'vstory-component-group';\n  numberType: number = COMPONENT_NUMBER_TYPE;\n\n  draw(group: IGroup, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    const { wipeDirection, wipeRatio, wipeColor, wipeBlur } = group.attribute as any;\n    const drawWipe = isFinite(wipeRatio);\n    let x1;\n    let y1;\n    let x2;\n    let y2;\n    if (drawWipe) {\n      const b = group.AABBBounds;\n      if (wipeDirection === Direction.LEFT_TO_RIGHT) {\n        x1 = b.x1;\n        y1 = b.y1;\n        x2 = x1 + b.width() * wipeRatio;\n        y2 = b.height() + y1;\n      } else if (wipeDirection === Direction.RIGHT_TO_LEFT) {\n        x2 = b.x1;\n        y1 = b.y1;\n        x1 = x2 - b.width() * wipeRatio;\n        y2 = b.height() + y1;\n      } else if (wipeDirection === Direction.TOP_TO_BOTTOM) {\n        x1 = b.x1;\n        y1 = b.y1;\n        x2 = x1 + b.width();\n        y2 = b.height() * wipeRatio + y1;\n      } else if (wipeDirection === Direction.BOTTOM_TO_TOP) {\n        x1 = b.x1;\n        y2 = b.y1;\n        x2 = x1 + b.width();\n        y1 = y2 - b.height() * wipeRatio;\n      }\n      context.save();\n      context.setTransformForCurrent();\n      context.beginPath();\n      context.rect(x1, y1, x2 - x1, y2 - y1);\n      context.clip();\n    }\n    super.draw(group, renderService, drawContext, params);\n    if (drawWipe) {\n      context.restore();\n    }\n  }\n}\n"]}

package/es/story/character/component/character-group/component-group-graphic.d.ts

@@ -20,8 +20,9 @@ export interface IChartGraphicAttribute extends IGroupGraphicAttribute {
     autoRender?: boolean;
     chartInitOptions?: any;
 }
-export declare const CHART_NUMBER_TYPE: number;
+export declare const COMPONENT_NUMBER_TYPE: number;
 export declare class ComponentGroup extends Group implements IVisactorGraphic {
     type: GraphicType;
     numberType: number;
+    constructor(attrs: IGroupGraphicAttribute);
 }

package/es/story/character/component/character-group/component-group-graphic.js

@@ -1,10 +1,18 @@
 import { genNumberType, Group } from "@visactor/vrender";
 
-export const CHART_NUMBER_TYPE = genNumberType();
+export const COMPONENT_NUMBER_TYPE = genNumberType();
 
 export class ComponentGroup extends Group {
-    constructor() {
-        super(...arguments), this.type = "vstory-component-group", this.numberType = CHART_NUMBER_TYPE;
+    constructor(attrs) {
+        super(Object.assign(Object.assign({
+            scaleX: 1,
+            scaleY: 1,
+            x: 0,
+            y: 0,
+            angle: 0
+        }, attrs), {
+            pickable: !1
+        })), this.type = "vstory-component-group", this.numberType = COMPONENT_NUMBER_TYPE;
     }
 }
 //# sourceMappingURL=component-group-graphic.js.map

package/es/story/character/component/character-group/component-group-graphic.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/character-group/component-group-graphic.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAoBzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AAGjD,MAAM,OAAO,cAAe,SAAQ,KAAK;IAAzC;;QACE,SAAI,GAAgB,wBAA+B,CAAC;QACpD,eAAU,GAAW,iBAAiB,CAAC;IACzC,CAAC;CAAA","file":"component-group-graphic.js","sourcesContent":["import type { IVisactorGraphic } from '../../visactor/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { ISpec, IVChart } from '@visactor/vchart';\nimport type { GraphicType, IGroupGraphicAttribute, ITicker } from '@visactor/vrender';\nimport { genNumberType, Group } from '@visactor/vrender';\n\nexport interface IChartGraphicAttribute extends IGroupGraphicAttribute {\n  renderCanvas: HTMLCanvasElement;\n  spec: any;\n  ClassType: any;\n  vchart: IVChart;\n  mode: string;\n  modeParams?: any;\n  dpr: number;\n  interactive: boolean;\n  animation: boolean;\n  disableTriggerEvent: boolean;\n  disableDirtyBounds: boolean;\n  viewBox: IBoundsLike;\n  ticker?: ITicker;\n  autoRender?: boolean;\n  chartInitOptions?: any;\n}\n\nexport const CHART_NUMBER_TYPE = genNumberType();\n\n// @ts-ignore\nexport class ComponentGroup extends Group implements IVisactorGraphic {\n  type: GraphicType = 'vstory-component-group' as any;\n  numberType: number = CHART_NUMBER_TYPE;\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/character-group/component-group-graphic.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAoBzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;AAGrD,MAAM,OAAO,cAAe,SAAQ,KAAK;IAIvC,YAAY,KAA6B;QAEvC,KAAK,+BAAG,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,IAAK,KAAK,KAAE,QAAQ,EAAE,KAAK,IAAG,CAAC;QALnF,SAAI,GAAgB,wBAA+B,CAAC;QACpD,eAAU,GAAW,qBAAqB,CAAC;IAK3C,CAAC;CACF","file":"component-group-graphic.js","sourcesContent":["import type { IVisactorGraphic } from '../../visactor/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { ISpec, IVChart } from '@visactor/vchart';\nimport type { GraphicType, IGroupGraphicAttribute, ITicker } from '@visactor/vrender';\nimport { genNumberType, Group } from '@visactor/vrender';\n\nexport interface IChartGraphicAttribute extends IGroupGraphicAttribute {\n  renderCanvas: HTMLCanvasElement;\n  spec: any;\n  ClassType: any;\n  vchart: IVChart;\n  mode: string;\n  modeParams?: any;\n  dpr: number;\n  interactive: boolean;\n  animation: boolean;\n  disableTriggerEvent: boolean;\n  disableDirtyBounds: boolean;\n  viewBox: IBoundsLike;\n  ticker?: ITicker;\n  autoRender?: boolean;\n  chartInitOptions?: any;\n}\n\nexport const COMPONENT_NUMBER_TYPE = genNumberType();\n\n// @ts-ignore\nexport class ComponentGroup extends Group implements IVisactorGraphic {\n  type: GraphicType = 'vstory-component-group' as any;\n  numberType: number = COMPONENT_NUMBER_TYPE;\n\n  constructor(attrs: IGroupGraphicAttribute) {\n    // vstory-component-group没有主题，必须都初始化，否则动画会找不到属性\n    super({ scaleX: 1, scaleY: 1, x: 0, y: 0, angle: 0, ...attrs, pickable: false });\n  }\n}\n"]}

package/es/story/character/component/character.d.ts

@@ -1,21 +1,24 @@
+import type { IBoundsLike } from '@visactor/vutils';
 import type { IGroup } from '@visactor/vrender';
-import { GraphicText } from './graphic/graphic-text';
+import { GraphicBaseText } from './graphic/graphic-base-text';
 import type { IComponentCharacterSpec } from '../dsl-interface';
 import { CharacterBase } from '../base/base';
 import type { Graphic } from './graphic/graphic';
 import type { StoryEvent } from '../../interface/runtime-interface';
 import type { ICharacterPickInfo } from '../runtime-interface';
 export declare abstract class CharacterComponent extends CharacterBase {
+    visActorType: 'component';
     protected _spec: IComponentCharacterSpec;
     get spec(): IComponentCharacterSpec;
-    protected _text: GraphicText;
-    get text(): GraphicText;
+    protected _text: GraphicBaseText;
+    get text(): GraphicBaseText;
+    get textGraphic(): import("@visactor/vrender").IRichText;
     protected _group: IGroup;
     get group(): IGroup;
     readonly graphicType: string;
     protected _parserSpec(): void;
     protected _initGraphics(): void;
-    setAttributes(attr: Record<string, any>): void;
+    setAttributes(updateAttr: Record<string, any>): void;
     protected abstract _createGraphic(): Graphic;
     protected _initRuntime(): void;
     show(): void;
@@ -28,5 +31,7 @@ export declare abstract class CharacterComponent extends CharacterBase {
     };
     clearCharacter(): void;
     getGraphicParent(): IGroup;
+    getLayoutBounds(): IBoundsLike;
     checkEvent(event: StoryEvent): false | ICharacterPickInfo;
+    release(): void;
 }