@visactor/vstory 0.0.4-alpha.1 → 0.0.4

package/es/story/character/base/base.js

@@ -1,12 +1,12 @@
 import { isValid, merge } from "@visactor/vutils";
 
 export class CharacterBase {
-    get graphic() {
-        return this._graphic;
-    }
     get spec() {
         return this._spec;
     }
+    get graphic() {
+        return this._graphic;
+    }
     get option() {
         return this._option;
     }
@@ -31,5 +31,8 @@ export class CharacterBase {
         this.clearCharacter(), this.init();
     }
     getPositionData() {}
+    release() {
+        this.graphic && this.graphic.release && this.graphic.release();
+    }
 }
 //# sourceMappingURL=base.js.map

package/es/story/character/base/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/base/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAQlD,MAAM,OAAgB,aAAa;IAGjC,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,YAAY,IAAoB,EAAE,MAA4B;QAC5D,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IACD,UAAU,CAAC,IAAkD;;QAC3D,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;SACrC;QACD,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACjC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACpE;IACH,CAAC;IAED,aAAa,CAAC,IAAyB;QACrC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,CAAS;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IASD,eAAe;QACb,OAAO;IACT,CAAC;CAOF","file":"base.js","sourcesContent":["import { isValid, merge } from '@visactor/vutils';\nimport type { ICharacterInitOption, ICharacterPickInfo } from '../runtime-interface';\nimport type { ICharacter, ICharacterSpec } from '..';\nimport type { IGroup } from '@visactor/vrender';\nimport type { StoryEvent } from '../../interface';\nimport { Graphic } from '../component/graphic/graphic';\nimport { IVisactorGraphic } from '../visactor/interface';\n\nexport abstract class CharacterBase implements ICharacter {\n  readonly id: string;\n  protected declare _graphic: Graphic | IVisactorGraphic;\n  get graphic() {\n    return this._graphic;\n  }\n  protected _spec: ICharacterSpec;\n  get spec() {\n    return this._spec;\n  }\n\n  protected _option: ICharacterInitOption;\n  get option() {\n    return this._option;\n  }\n\n  constructor(spec: ICharacterSpec, option: ICharacterInitOption) {\n    this.id = spec.id;\n    this._spec = spec;\n    this._option = option;\n  }\n  updateSpec(spec: Omit<Partial<ICharacterSpec>, 'id' | 'type'>): void {\n    if (spec.position) {\n      this._spec.position = spec.position;\n    }\n    if (isValid(spec.zIndex)) {\n      this._spec.zIndex = spec.zIndex;\n    }\n    if (spec.options) {\n      this._spec.options = merge(this._spec.options ?? {}, spec.options);\n    }\n  }\n\n  setAttributes(attr: Record<string, any>) {\n    throw new Error('请重载setAttributes函数');\n  }\n\n  tickTo(t: number): void {\n    throw new Error('Method not implemented.');\n  }\n\n  init() {\n    this._initRuntime();\n    this._parserSpec();\n    this._initGraphics();\n  }\n\n  reset() {\n    this.clearCharacter();\n    this.init();\n  }\n\n  protected abstract _initRuntime(): void;\n  protected abstract _parserSpec(): void;\n  protected abstract _initGraphics(): void;\n\n  abstract show(): void;\n  abstract hide(): void;\n\n  getPositionData() {\n    return;\n  }\n\n  abstract getGraphicParent(): IGroup;\n\n  abstract clearCharacter(): void;\n\n  abstract checkEvent(event: StoryEvent): false | ICharacterPickInfo;\n}\n"]}
+{"version":3,"sources":["../src/story/character/base/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAOlD,MAAM,OAAgB,aAAa;IAGjC,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,YAAY,IAAoB,EAAE,MAA4B;QAC5D,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IACD,UAAU,CAAC,IAAkD;;QAC3D,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;SACrC;QACD,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACjC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACpE;IACH,CAAC;IAED,aAAa,CAAC,IAAyB;QACrC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,CAAS;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IASD,eAAe;QACb,OAAO;IACT,CAAC;IAOD,OAAO;QACL,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACjE,CAAC;CACF","file":"base.js","sourcesContent":["import { isValid, merge } from '@visactor/vutils';\nimport type { ICharacterInitOption, ICharacterPickInfo } from '../runtime-interface';\nimport type { ICharacter, ICharacterSpec } from '..';\nimport type { IGroup } from '@visactor/vrender';\nimport type { StoryEvent } from '../../interface';\nimport { IVisactorGraphic } from '../visactor/interface';\n\nexport abstract class CharacterBase implements ICharacter {\n  readonly id: string;\n  protected _spec: ICharacterSpec;\n  get spec() {\n    return this._spec;\n  }\n  protected declare _graphic: any;\n  get graphic() {\n    return this._graphic;\n  }\n\n  protected _option: ICharacterInitOption;\n  get option() {\n    return this._option;\n  }\n\n  constructor(spec: ICharacterSpec, option: ICharacterInitOption) {\n    this.id = spec.id;\n    this._spec = spec;\n    this._option = option;\n  }\n  updateSpec(spec: Omit<Partial<ICharacterSpec>, 'id' | 'type'>): void {\n    if (spec.position) {\n      this._spec.position = spec.position;\n    }\n    if (isValid(spec.zIndex)) {\n      this._spec.zIndex = spec.zIndex;\n    }\n    if (spec.options) {\n      this._spec.options = merge(this._spec.options ?? {}, spec.options);\n    }\n  }\n\n  setAttributes(attr: Record<string, any>) {\n    throw new Error('请重载setAttributes函数');\n  }\n\n  tickTo(t: number): void {\n    throw new Error('Method not implemented.');\n  }\n\n  init() {\n    this._initRuntime();\n    this._parserSpec();\n    this._initGraphics();\n  }\n\n  reset() {\n    this.clearCharacter();\n    this.init();\n  }\n\n  protected abstract _initRuntime(): void;\n  protected abstract _parserSpec(): void;\n  protected abstract _initGraphics(): void;\n\n  abstract show(): void;\n  abstract hide(): void;\n\n  getPositionData() {\n    return;\n  }\n\n  abstract getGraphicParent(): IGroup;\n\n  abstract clearCharacter(): void;\n\n  abstract checkEvent(event: StoryEvent): false | ICharacterPickInfo;\n  release() {\n    this.graphic && this.graphic.release && this.graphic.release();\n  }\n}\n"]}

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

@@ -21,4 +21,5 @@ export declare class CharacterChart extends CharacterVisactor {
     clearCharacter(): void;
     tickTo(t: number): void;
     checkEvent(event: StoryEvent): false | ICharacterPickInfo;
+    release(): void;
 }

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

@@ -93,6 +93,9 @@ export class CharacterChart extends CharacterVisactor {
     checkEvent(event) {
         return !1;
     }
+    release() {
+        this.option.graphicParent.removeChild(this._graphic), this._graphic.release && this._graphic.release();
+    }
 }
 
 CharacterChart.type = "CharacterChart", CharacterChart.RunTime = [ ComponentSpecRuntime, CommonSpecRuntime, SeriesSpecRuntime ];

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/character.ts"],"names":[],"mappings":"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","file":"character.js","sourcesContent":["import { CommonSpecRuntime } from './runtime/common-spec';\nimport { ComponentSpecRuntime } from './runtime/component-spec';\nimport type { IChartCharacterRuntimeConstructor } from './runtime/interface';\nimport { cloneDeep } from '@visactor/vutils';\nimport { VChart } from '@visactor/vchart';\nimport type { IChartCharacterSpec } from '../dsl-interface';\nimport { Chart } from './graphic/vchart-graphic';\nimport { getLayoutFromWidget } from '../../utils/layout';\nimport { CharacterVisactor } from '../visactor/character';\nimport { SpecProcess } from './spec-process/spec-process';\nimport { ChartDataTempTransform } from './spec-process/data-temp-transform';\nimport type { ITicker } from '@visactor/vrender';\nimport type { IChartTemp } from './temp/interface';\nimport { SeriesSpecRuntime } from './runtime/series-spec';\nimport type { StoryEvent } from '../../interface/runtime-interface';\nimport type { ICharacterPickInfo } from '../runtime-interface';\n\nexport class CharacterChart extends CharacterVisactor {\n  static type = 'CharacterChart';\n  static RunTime: IChartCharacterRuntimeConstructor[] = [\n    ComponentSpecRuntime as unknown as IChartCharacterRuntimeConstructor,\n    CommonSpecRuntime as unknown as IChartCharacterRuntimeConstructor,\n    SeriesSpecRuntime as unknown as IChartCharacterRuntimeConstructor\n  ];\n\n  protected declare _specProcess: SpecProcess;\n  protected _ticker: ITicker;\n\n  protected declare _spec: IChartCharacterSpec;\n  get spec() {\n    return this._spec;\n  }\n\n  protected _initSpecProcess(): void {\n    this._specProcess = new SpecProcess(this as any, ChartDataTempTransform, this.onSpecReady);\n  }\n\n  protected _initRuntime(): void {\n    CharacterChart.RunTime.forEach(R => {\n      this._runtime.push(new R(this));\n    });\n  }\n\n  protected _parserSpec(): void {\n    this._specProcess.updateConfig(this._spec);\n  }\n  protected _initGraphics(): void {\n    // this._ticker = new ManualTicker([]);\n    const layout = getLayoutFromWidget(this._spec.position);\n    const viewBox = {\n      x1: layout.x,\n      x2: layout.x + layout.width,\n      y1: layout.y,\n      y2: layout.y + layout.height\n    };\n    const spec = cloneDeep(this._specProcess.getVisSpec());\n    spec.width = layout.width;\n    spec.height = layout.height;\n    // @ts-ignore\n    this._graphic = new Chart({\n      renderCanvas: this._option.canvas.getCanvas(),\n      spec: spec,\n      ClassType: VChart,\n      vchart: null,\n      zIndex: this._spec.zIndex,\n      mode: 'desktop-browser',\n      dpr: window.devicePixelRatio,\n      interactive: false,\n      autoRender: false,\n      disableDirtyBounds: true,\n      viewBox,\n      ticker: this._option.canvas.getStage().ticker,\n      visibleAll: false,\n      ...(this._spec.options.panel ?? {}),\n      chartInitOptions: {\n        animation: true,\n        disableTriggerEvent: true,\n        performanceHook: {\n          afterInitializeChart: () => {\n            (<IChartTemp>this.specProcess.dataTempTransform?.specTemp)?.afterInitializeChart({ character: this });\n            this._runtime.forEach(r => r.afterInitializeChart?.());\n          },\n          afterVRenderDraw: () => {\n            this._runtime.forEach(r => r.afterVRenderDraw?.());\n          }\n        }\n      }\n    });\n    this.option.graphicParent.add(this._graphic as any);\n  }\n\n  protected _afterRender(): void {\n    // console.log('afterRender');\n    return;\n  }\n  protected _updateVisactorSpec(): void {\n    // console.log('_updateVisactorSpec', this._specProcess.getVisSpec());\n    this._graphic?.updateSpec(this._specProcess.getVisSpec());\n  }\n\n  clearCharacter(): void {\n    this._graphic.vProduct.release();\n    this._graphic.parent.removeChild(this._graphic);\n  }\n\n  tickTo(t: number): void {\n    this._ticker.tickAt(t);\n  }\n\n  checkEvent(event: StoryEvent): false | ICharacterPickInfo {\n    return false;\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/chart/character.ts"],"names":[],"mappings":"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","file":"character.js","sourcesContent":["import { CommonSpecRuntime } from './runtime/common-spec';\nimport { ComponentSpecRuntime } from './runtime/component-spec';\nimport type { IChartCharacterRuntimeConstructor } from './runtime/interface';\nimport { cloneDeep } from '@visactor/vutils';\nimport { VChart } from '@visactor/vchart';\nimport type { IChartCharacterSpec } from '../dsl-interface';\nimport { Chart } from './graphic/vchart-graphic';\nimport { getLayoutFromWidget } from '../../utils/layout';\nimport { CharacterVisactor } from '../visactor/character';\nimport { SpecProcess } from './spec-process/spec-process';\nimport { ChartDataTempTransform } from './spec-process/data-temp-transform';\nimport type { ITicker } from '@visactor/vrender';\nimport type { IChartTemp } from './temp/interface';\nimport { SeriesSpecRuntime } from './runtime/series-spec';\nimport type { StoryEvent } from '../../interface/runtime-interface';\nimport type { ICharacterPickInfo } from '../runtime-interface';\n\nexport class CharacterChart extends CharacterVisactor {\n  static type = 'CharacterChart';\n  static RunTime: IChartCharacterRuntimeConstructor[] = [\n    ComponentSpecRuntime as unknown as IChartCharacterRuntimeConstructor,\n    CommonSpecRuntime as unknown as IChartCharacterRuntimeConstructor,\n    SeriesSpecRuntime as unknown as IChartCharacterRuntimeConstructor\n  ];\n\n  protected declare _specProcess: SpecProcess;\n  protected _ticker: ITicker;\n\n  protected declare _spec: IChartCharacterSpec;\n  get spec() {\n    return this._spec;\n  }\n\n  protected _initSpecProcess(): void {\n    this._specProcess = new SpecProcess(this as any, ChartDataTempTransform, this.onSpecReady);\n  }\n\n  protected _initRuntime(): void {\n    CharacterChart.RunTime.forEach(R => {\n      this._runtime.push(new R(this));\n    });\n  }\n\n  protected _parserSpec(): void {\n    this._specProcess.updateConfig(this._spec);\n  }\n  protected _initGraphics(): void {\n    // this._ticker = new ManualTicker([]);\n    const layout = getLayoutFromWidget(this._spec.position);\n    const viewBox = {\n      x1: layout.x,\n      x2: layout.x + layout.width,\n      y1: layout.y,\n      y2: layout.y + layout.height\n    };\n    const spec = cloneDeep(this._specProcess.getVisSpec());\n    spec.width = layout.width;\n    spec.height = layout.height;\n    // @ts-ignore\n    this._graphic = new Chart({\n      renderCanvas: this._option.canvas.getCanvas(),\n      spec: spec,\n      ClassType: VChart,\n      vchart: null,\n      zIndex: this._spec.zIndex,\n      mode: 'desktop-browser',\n      dpr: window.devicePixelRatio,\n      interactive: false,\n      autoRender: false,\n      disableDirtyBounds: true,\n      viewBox,\n      ticker: this._option.canvas.getStage().ticker,\n      visibleAll: false,\n      ...(this._spec.options.panel ?? {}),\n      chartInitOptions: {\n        animation: true,\n        disableTriggerEvent: true,\n        performanceHook: {\n          afterInitializeChart: () => {\n            (<IChartTemp>this.specProcess.dataTempTransform?.specTemp)?.afterInitializeChart({ character: this });\n            this._runtime.forEach(r => r.afterInitializeChart?.());\n          },\n          afterVRenderDraw: () => {\n            this._runtime.forEach(r => r.afterVRenderDraw?.());\n          }\n        }\n      }\n    });\n    this.option.graphicParent.add(this._graphic as any);\n  }\n\n  protected _afterRender(): void {\n    // console.log('afterRender');\n    return;\n  }\n  protected _updateVisactorSpec(): void {\n    // console.log('_updateVisactorSpec', this._specProcess.getVisSpec());\n    this._graphic?.updateSpec(this._specProcess.getVisSpec());\n  }\n\n  clearCharacter(): void {\n    this._graphic.vProduct.release();\n    this._graphic.parent.removeChild(this._graphic);\n  }\n\n  tickTo(t: number): void {\n    this._ticker.tickAt(t);\n  }\n\n  checkEvent(event: StoryEvent): false | ICharacterPickInfo {\n    return false;\n  }\n\n  release(): void {\n    this.option.graphicParent.removeChild(this._graphic as any);\n    this._graphic.release && this._graphic.release();\n  }\n}\n"]}

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

@@ -24,9 +24,9 @@ let VChartRender = class extends DefaultCanvasRectRender {
         context.baseGlobalAlpha /= baseOpacity;
         const chartStage = chart.vchart.getStage(), chartCtx = chartStage.window.getContext();
         chartCtx.baseGlobalAlpha *= baseOpacity, chartStage._editor_needRender = !0;
-        const matrix = chart.globalTransMatrix.clone(), stageMatrix = chart.stage.window.getViewBoxTransform();
-        matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f), 
-        chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f), 
+        const matrix = chart.globalTransMatrix.clone(), stageMatrix = chart.stage.window.getViewBoxTransform().clone();
+        stageMatrix.multiply(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f), 
+        chartStage.window.setViewBoxTransform(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f), 
         null === (_a = chartStage.dirtyBounds) || void 0 === _a || _a.clear(), chartStage.render(), 
         chartCtx.baseGlobalAlpha /= baseOpacity;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/chart/graphic/vchart-graphic-render.ts"],"names":[],"mappings":";;;;;;AAWA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AACrD,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AAGtE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,uBAAuB;IAAlD;;QAEL,eAAU,GAAW,iBAAiB,CAAC;IAiDzC,CAAC;IA/CC,SAAS,CACP,KAAU,EACV,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAEZ,MAAM,EAAE,WAAW,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;QAC5C,IAAI,WAAW,IAAI,CAAC,EAAE;YACpB,OAAO;SACR;QACD,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC;QACvC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7E,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC;QACvC,MAAM,MAAM,GAAI,KAAe,CAAC,MAAM,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAChD,QAAQ,CAAC,eAAe,IAAI,WAAW,CAAC;QAExC,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC7D,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAC1G,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAClG,MAAA,UAAU,CAAC,WAAW,0CAAE,KAAK,EAAE,CAAC;QAChC,UAAU,CAAC,MAAM,EAAE,CAAC;QACpB,QAAQ,CAAC,eAAe,IAAI,WAAW,CAAC;IAI1C,CAAC;IAED,IAAI,CAAC,KAAU,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAE1G,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAS,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;CACF,CAAA;AAnDY,YAAY;IADxB,UAAU,EAAE;GACA,YAAY,CAmDxB;SAnDY,YAAY","file":"vchart-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} from '@visactor/vrender';\nimport { injectable, DefaultCanvasRectRender } from '@visactor/vrender';\nimport type { Chart } from './vchart-graphic';\nimport { CHART_NUMBER_TYPE } from './vchart-graphic';\n\nexport const ChartRender = Symbol.for('ChartRender');\nexport const ChartRenderContribution = Symbol.for('ChartRenderContribution');\n\n@injectable()\nexport class VChartRender extends DefaultCanvasRectRender implements IGraphicRender {\n  type: 'chart';\n  numberType: number = CHART_NUMBER_TYPE;\n\n  drawShape(\n    chart: any,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const { baseOpacity = 1 } = chart.attribute;\n    if (baseOpacity <= 0) {\n      return;\n    }\n    context.baseGlobalAlpha *= baseOpacity;\n    super.drawShape(chart, context, x, y, drawContext, params, fillCb, strokeCb);\n    context.baseGlobalAlpha /= baseOpacity;\n    const vChart = (chart as Chart).vchart;\n    const chartStage = vChart.getStage();\n    const chartCtx = chartStage.window.getContext();\n    chartCtx.baseGlobalAlpha *= baseOpacity;\n    // @ts-ignore\n    chartStage._editor_needRender = true;\n    const matrix = chart.globalTransMatrix.clone();\n    const stageMatrix = chart.stage.window.getViewBoxTransform();\n    matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);\n    chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);\n    chartStage.dirtyBounds?.clear();\n    chartStage.render();\n    chartCtx.baseGlobalAlpha /= baseOpacity;\n    // const ctx = chartStage.window.getContext();\n    // ctx.fillStyle = 'green';\n    // ctx.fillRect(0, 0, 100, 100);\n  }\n\n  draw(chart: any, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    // const chartAttribute = getTheme(chart, params?.theme).circle;\n    this._draw(chart, {} as any, false, drawContext, params);\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/chart/graphic/vchart-graphic-render.ts"],"names":[],"mappings":";;;;;;AAWA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AACrD,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AAGtE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,uBAAuB;IAAlD;;QAEL,eAAU,GAAW,iBAAiB,CAAC;IAwDzC,CAAC;IAtDC,SAAS,CACP,KAAU,EACV,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAEZ,MAAM,EAAE,WAAW,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;QAC5C,IAAI,WAAW,IAAI,CAAC,EAAE;YACpB,OAAO;SACR;QACD,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC;QACvC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7E,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC;QACvC,MAAM,MAAM,GAAI,KAAe,CAAC,MAAM,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAChD,QAAQ,CAAC,eAAe,IAAI,WAAW,CAAC;QAExC,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,CAAC;QACrE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACjF,UAAU,CAAC,MAAM,CAAC,mBAAmB,CACnC,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,EACb,WAAW,CAAC,CAAC,CACd,CAAC;QACF,MAAA,UAAU,CAAC,WAAW,0CAAE,KAAK,EAAE,CAAC;QAChC,UAAU,CAAC,MAAM,EAAE,CAAC;QACpB,QAAQ,CAAC,eAAe,IAAI,WAAW,CAAC;IAI1C,CAAC;IAED,IAAI,CAAC,KAAU,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAE1G,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAS,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;CACF,CAAA;AA1DY,YAAY;IADxB,UAAU,EAAE;GACA,YAAY,CA0DxB;SA1DY,YAAY","file":"vchart-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} from '@visactor/vrender';\nimport { injectable, DefaultCanvasRectRender } from '@visactor/vrender';\nimport type { Chart } from './vchart-graphic';\nimport { CHART_NUMBER_TYPE } from './vchart-graphic';\n\nexport const ChartRender = Symbol.for('ChartRender');\nexport const ChartRenderContribution = Symbol.for('ChartRenderContribution');\n\n@injectable()\nexport class VChartRender extends DefaultCanvasRectRender implements IGraphicRender {\n  type: 'chart';\n  numberType: number = CHART_NUMBER_TYPE;\n\n  drawShape(\n    chart: any,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const { baseOpacity = 1 } = chart.attribute;\n    if (baseOpacity <= 0) {\n      return;\n    }\n    context.baseGlobalAlpha *= baseOpacity;\n    super.drawShape(chart, context, x, y, drawContext, params, fillCb, strokeCb);\n    context.baseGlobalAlpha /= baseOpacity;\n    const vChart = (chart as Chart).vchart;\n    const chartStage = vChart.getStage();\n    const chartCtx = chartStage.window.getContext();\n    chartCtx.baseGlobalAlpha *= baseOpacity;\n    // @ts-ignore\n    chartStage._editor_needRender = true;\n    const matrix = chart.globalTransMatrix.clone();\n    const stageMatrix = chart.stage.window.getViewBoxTransform().clone();\n    stageMatrix.multiply(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);\n    chartStage.window.setViewBoxTransform(\n      stageMatrix.a,\n      stageMatrix.b,\n      stageMatrix.c,\n      stageMatrix.d,\n      stageMatrix.e,\n      stageMatrix.f\n    );\n    chartStage.dirtyBounds?.clear();\n    chartStage.render();\n    chartCtx.baseGlobalAlpha /= baseOpacity;\n    // const ctx = chartStage.window.getContext();\n    // ctx.fillStyle = 'green';\n    // ctx.fillRect(0, 0, 100, 100);\n  }\n\n  draw(chart: any, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    // const chartAttribute = getTheme(chart, params?.theme).circle;\n    this._draw(chart, {} as any, false, drawContext, params);\n  }\n}\n"]}

package/es/story/character/chart/graphic/vchart-graphic.d.ts

@@ -32,4 +32,5 @@ export declare class Chart extends Group implements IVisactorGraphic {
     updateSpec(spec: ISpec, forceMerge?: boolean, morphConfig?: boolean): void;
     updateViewBox(viewBox: IBoundsLike): void;
     private _updateViewBox;
+    release(): void;
 }

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

@@ -35,8 +35,9 @@ 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.pauseRender(), this._vchart.renderSync(), stage.stage.resumeRender(), 
         stage && (stage.background = !1, stage.pauseTriggerEvent()), params.viewBox && this.updateViewBox(params.viewBox);
     }
     updateSpec(spec, forceMerge = !1, morphConfig = !1) {
@@ -55,5 +56,8 @@ export class Chart extends Group {
         }), 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);
     }
+    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":"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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  // 是否试一次空render，目的是只生成场景树，不会真实渲染\n  // protected _emptyRenderCall: boolean;\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    // 背景设置为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  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  release() {\n    this._vchart && this._vchart.release();\n  }\n}\n"]}

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

@@ -24,4 +24,5 @@ export declare const CHART_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

@@ -3,8 +3,14 @@ import { genNumberType, Group } from "@visactor/vrender";
 export const CHART_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({
+            scaleX: 1,
+            scaleY: 1,
+            x: 0,
+            y: 0,
+            angle: 0
+        }, attrs)), this.type = "vstory-component-group", this.numberType = CHART_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,iBAAiB,GAAG,aAAa,EAAE,CAAC;AAGjD,MAAM,OAAO,cAAe,SAAQ,KAAK;IAIvC,YAAY,KAA6B;QAEvC,KAAK,iBAAG,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,IAAK,KAAK,EAAG,CAAC;QALlE,SAAI,GAAgB,wBAA+B,CAAC;QACpD,eAAU,GAAW,iBAAiB,CAAC;IAKvC,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 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  constructor(attrs: IGroupGraphicAttribute) {\n    // vstory-component-group没有主题，必须都初始化，否则动画会找不到属性\n    super({ scaleX: 1, scaleY: 1, x: 0, y: 0, angle: 0, ...attrs });\n  }\n}\n"]}

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

@@ -1,5 +1,5 @@
 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';
@@ -8,8 +8,8 @@ import type { ICharacterPickInfo } from '../runtime-interface';
 export declare abstract class CharacterComponent extends CharacterBase {
     protected _spec: IComponentCharacterSpec;
     get spec(): IComponentCharacterSpec;
-    protected _text: GraphicText;
-    get text(): GraphicText;
+    protected _text: GraphicBaseText;
+    get text(): GraphicBaseText;
     protected _group: IGroup;
     get group(): IGroup;
     readonly graphicType: string;
@@ -29,4 +29,5 @@ export declare abstract class CharacterComponent extends CharacterBase {
     clearCharacter(): void;
     getGraphicParent(): IGroup;
     checkEvent(event: StoryEvent): false | ICharacterPickInfo;
+    release(): void;
 }

package/es/story/character/component/character.js

@@ -1,4 +1,4 @@
-import { GraphicText } from "./graphic/graphic-text";
+import { GraphicBaseText } from "./graphic/graphic-base-text";
 
 import { CharacterBase } from "../base/base";
 
@@ -25,9 +25,10 @@ export class CharacterComponent extends CharacterBase {
             angle: this._spec.options.angle,
             zIndex: this._spec.zIndex
         })), this.option.graphicParent.add(this._group), this._graphic = this._createGraphic(), 
-        this._text = new GraphicText(this), this._graphic.init(), this._text.init(), this._graphic.applyGraphicAttribute(this._spec.options.graphic), 
-        this._text.applyGraphicAttribute(this._spec.options.text), this._graphic.applyLayoutData(this._spec.position), 
-        this._text.applyLayoutData(this._spec.position), this.hide();
+        this._text = new GraphicBaseText(this), this._graphic.init(), this._text.init(), 
+        this._graphic.applyGraphicAttribute(this._spec.options.graphic), this._text.applyGraphicAttribute(this._spec.options.text), 
+        this._graphic.applyLayoutData(this._spec.position), this._text.applyLayoutData(this._spec.position), 
+        this.hide();
     }
     setAttributes(attr) {
         this.group.setAttributes(attr), this._graphic.setAttributes(Object.assign(Object.assign({}, attr), {
@@ -65,5 +66,8 @@ export class CharacterComponent extends CharacterBase {
             graphicType: this.graphicType
         };
     }
+    release() {
+        this.option.graphicParent.removeChild(this._group);
+    }
 }
 //# sourceMappingURL=character.js.map

package/es/story/character/component/character.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/character.ts"],"names":[],"mappings":"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","file":"character.js","sourcesContent":["import type { IGroup } from '@visactor/vrender';\nimport { createGroup } from '@visactor/vrender';\nimport { GraphicText } from './graphic/graphic-text';\nimport type { IComponentCharacterSpec } from '../dsl-interface';\nimport { CharacterBase } from '../base/base';\nimport type { Graphic } from './graphic/graphic';\nimport { getLayoutFromWidget } from '../../utils/layout';\nimport type { StoryEvent } from '../../interface/runtime-interface';\nimport type { ICharacterPickInfo } from '../runtime-interface';\nimport { ComponentGroup } from './character-group/component-group-graphic';\n\nexport abstract class CharacterComponent extends CharacterBase {\n  protected declare _spec: IComponentCharacterSpec;\n  get spec() {\n    return this._spec;\n  }\n  protected declare _text: GraphicText;\n  get text() {\n    return this._text;\n  }\n\n  protected declare _group: IGroup;\n  get group() {\n    return this._group;\n  }\n\n  readonly graphicType: string = 'rect';\n\n  protected _parserSpec(): void {\n    return;\n  }\n\n  protected _initGraphics(): void {\n    this._group = new ComponentGroup({\n      ...getLayoutFromWidget(this._spec.position),\n      angle: this._spec.options.angle,\n      zIndex: this._spec.zIndex\n    });\n    this.option.graphicParent.add(this._group);\n\n    this._graphic = this._createGraphic();\n    this._text = new GraphicText(this);\n    this._graphic.init();\n    this._text.init();\n\n    this._graphic.applyGraphicAttribute(this._spec.options.graphic);\n    this._text.applyGraphicAttribute(this._spec.options.text);\n\n    this._graphic.applyLayoutData(this._spec.position);\n    this._text.applyLayoutData(this._spec.position);\n    this.hide();\n  }\n\n  setAttributes(attr: Record<string, any>): void {\n    this.group.setAttributes(attr);\n    this._graphic.setAttributes({ ...attr, x: 0, y: 0, angle: 0 });\n    this._text.updateAttribute({});\n  }\n\n  protected abstract _createGraphic(): Graphic;\n\n  protected _initRuntime(): void {\n    return;\n  }\n\n  show(): void {\n    this._group.setAttributes({ visible: true });\n    this._text.show();\n    this._graphic.show();\n  }\n  hide(): void {\n    this._group.setAttributes({ visible: false });\n    this._text.hide();\n    this._graphic.hide();\n  }\n\n  getTextLayoutRatio(): { left: number; right: number; top: number; bottom: number } {\n    return this._graphic.getTextLayoutRatio();\n  }\n\n  clearCharacter(): void {\n    this._group?.parent.removeChild(this._group);\n    this._group = null;\n  }\n\n  getGraphicParent() {\n    return this._group;\n  }\n\n  checkEvent(event: StoryEvent): false | ICharacterPickInfo {\n    if (!(event.detailPath ?? event.path).some(g => g === this._group)) {\n      return false;\n    }\n    return {\n      part: event.path[event.path.length - 1] === this._graphic.graphic ? 'graphic' : 'text',\n      graphicType: this.graphicType\n    };\n  }\n}\n\n// export abstract class CharacterGraphicComponent extends CharacterBase {\n//   protected declare _spec: IComponentCharacterSpec;\n\n//   get spec() {\n//     return this._spec;\n//   }\n//   protected declare _graphic: Graphic;\n//   get graphic() {\n//     return this._graphic;\n//   }\n\n//   protected declare _group: IGroup;\n//   get group() {\n//     return this._group;\n//   }\n\n//   protected abstract _createGraphic(): Graphic;\n\n//   protected _initRuntime(): void {\n//     return;\n//   }\n\n//   protected _parserSpec(): void {\n//     return;\n//   }\n\n//   protected _initGraphics(): void {\n//     this._group = createGroup({\n//       ...getLayoutFromWidget(this._spec.position),\n//       angle: this._spec.options.angle,\n//       zIndex: this._spec.zIndex\n//     });\n//     this.option.graphicParent.add(this._group);\n\n//     this._graphic = this._createGraphic();\n//     this._graphic.init();\n\n//     this._graphic.applyGraphicAttribute(this._spec.options.graphic);\n\n//     this._graphic.applyLayoutData(this._spec.position);\n//     this.hide();\n//   }\n\n//   show(): void {\n//     this._graphic?.show();\n//   }\n//   hide(): void {\n//     this._graphic?.hide();\n//   }\n\n//   getGraphicParent() {\n//     return this._group;\n//   }\n\n//   clearCharacter(): void {\n//     if (this._group) {\n//       this._group.parent.removeChild(this._group);\n//       this._graphic = null;\n//     }\n//   }\n// }\n"]}
+{"version":3,"sources":["../src/story/character/component/character.ts"],"names":[],"mappings":"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","file":"character.js","sourcesContent":["import type { IGroup } from '@visactor/vrender';\nimport { createGroup } from '@visactor/vrender';\nimport { GraphicBaseText } from './graphic/graphic-base-text';\nimport type { IComponentCharacterSpec } from '../dsl-interface';\nimport { CharacterBase } from '../base/base';\nimport type { Graphic } from './graphic/graphic';\nimport { getLayoutFromWidget } from '../../utils/layout';\nimport type { StoryEvent } from '../../interface/runtime-interface';\nimport type { ICharacterPickInfo } from '../runtime-interface';\nimport { ComponentGroup } from './character-group/component-group-graphic';\n\nexport abstract class CharacterComponent extends CharacterBase {\n  protected declare _spec: IComponentCharacterSpec;\n  get spec() {\n    return this._spec;\n  }\n  // protected declare _graphic: Graphic;\n  // get graphic() {\n  //   return this._graphic;\n  // }\n  protected declare _text: GraphicBaseText;\n  get text() {\n    return this._text;\n  }\n\n  protected declare _group: IGroup;\n  get group() {\n    return this._group;\n  }\n\n  readonly graphicType: string = 'rect';\n\n  protected _parserSpec(): void {\n    return;\n  }\n\n  protected _initGraphics(): void {\n    this._group = new ComponentGroup({\n      ...getLayoutFromWidget(this._spec.position),\n      angle: this._spec.options.angle,\n      zIndex: this._spec.zIndex\n    });\n    this.option.graphicParent.add(this._group);\n\n    this._graphic = this._createGraphic();\n    this._text = new GraphicBaseText(this);\n    this._graphic.init();\n    this._text.init();\n\n    this._graphic.applyGraphicAttribute(this._spec.options.graphic);\n    this._text.applyGraphicAttribute(this._spec.options.text);\n\n    this._graphic.applyLayoutData(this._spec.position);\n    this._text.applyLayoutData(this._spec.position);\n    this.hide();\n  }\n\n  setAttributes(attr: Record<string, any>): void {\n    this.group.setAttributes(attr);\n    this._graphic.setAttributes({ ...attr, x: 0, y: 0, angle: 0 });\n    this._text.updateAttribute({});\n  }\n\n  protected abstract _createGraphic(): Graphic;\n\n  protected _initRuntime(): void {\n    return;\n  }\n\n  show(): void {\n    this._group.setAttributes({ visible: true });\n    this._text.show();\n    this._graphic.show();\n  }\n  hide(): void {\n    this._group.setAttributes({ visible: false });\n    this._text.hide();\n    this._graphic.hide();\n  }\n\n  getTextLayoutRatio(): { left: number; right: number; top: number; bottom: number } {\n    return this._graphic.getTextLayoutRatio();\n  }\n\n  clearCharacter(): void {\n    this._group?.parent.removeChild(this._group);\n    this._group = null;\n  }\n\n  getGraphicParent() {\n    return this._group;\n  }\n\n  checkEvent(event: StoryEvent): false | ICharacterPickInfo {\n    if (!(event.detailPath ?? event.path).some(g => g === this._group)) {\n      return false;\n    }\n    return {\n      part: event.path[event.path.length - 1] === this._graphic.graphic ? 'graphic' : 'text',\n      graphicType: this.graphicType\n    };\n  }\n\n  release() {\n    this.option.graphicParent.removeChild(this._group);\n  }\n}\n\n// export abstract class CharacterGraphicComponent extends CharacterBase {\n//   protected declare _spec: IComponentCharacterSpec;\n\n//   get spec() {\n//     return this._spec;\n//   }\n//   protected declare _graphic: Graphic;\n//   get graphic() {\n//     return this._graphic;\n//   }\n\n//   protected declare _group: IGroup;\n//   get group() {\n//     return this._group;\n//   }\n\n//   protected abstract _createGraphic(): Graphic;\n\n//   protected _initRuntime(): void {\n//     return;\n//   }\n\n//   protected _parserSpec(): void {\n//     return;\n//   }\n\n//   protected _initGraphics(): void {\n//     this._group = createGroup({\n//       ...getLayoutFromWidget(this._spec.position),\n//       angle: this._spec.options.angle,\n//       zIndex: this._spec.zIndex\n//     });\n//     this.option.graphicParent.add(this._group);\n\n//     this._graphic = this._createGraphic();\n//     this._graphic.init();\n\n//     this._graphic.applyGraphicAttribute(this._spec.options.graphic);\n\n//     this._graphic.applyLayoutData(this._spec.position);\n//     this.hide();\n//   }\n\n//   show(): void {\n//     this._graphic?.show();\n//   }\n//   hide(): void {\n//     this._graphic?.hide();\n//   }\n\n//   getGraphicParent() {\n//     return this._group;\n//   }\n\n//   clearCharacter(): void {\n//     if (this._group) {\n//       this._group.parent.removeChild(this._group);\n//       this._graphic = null;\n//     }\n//   }\n// }\n"]}

package/es/story/character/component/characters/character-richtext.d.ts

@@ -1,6 +1 @@
-import type { Graphic } from '../graphic/graphic';
-import { CharacterComponent } from '../character';
-export declare class CharacterComponentRichText extends CharacterComponent {
-    readonly graphicType: string;
-    protected _createGraphic(): Graphic;
-}
+

package/es/story/character/component/characters/character-richtext.js

@@ -1,15 +1,3 @@
-import { GraphicRichText } from "../graphic/richtext";
 
-import { CharacterComponent } from "../character";
 
-import { StoryComponentType } from "../../../../constants/character";
-
-export class CharacterComponentRichText extends CharacterComponent {
-    constructor() {
-        super(...arguments), this.graphicType = "richtext";
-    }
-    _createGraphic() {
-        return new GraphicRichText(StoryComponentType.RICH_TEXT, this);
-    }
-}
 //# sourceMappingURL=character-richtext.js.map

package/es/story/character/component/characters/character-richtext.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/characters/character-richtext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IAAlE;;QACW,gBAAW,GAAW,UAAU,CAAC;IAI5C,CAAC;IAHW,cAAc;QACtB,OAAO,IAAI,eAAe,CAAC,kBAAkB,CAAC,SAAS,EAAE,IAAW,CAAC,CAAC;IACxE,CAAC;CACF","file":"character-richtext.js","sourcesContent":["import type { Graphic } from '../graphic/graphic';\nimport { GraphicRichText } from '../graphic/richtext';\nimport { CharacterComponent } from '../character';\nimport { StoryComponentType } from '../../../../constants/character';\n\nexport class CharacterComponentRichText extends CharacterComponent {\n  readonly graphicType: string = 'richtext';\n  protected _createGraphic(): Graphic {\n    return new GraphicRichText(StoryComponentType.RICH_TEXT, this as any);\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/characters/character-richtext.ts"],"names":[],"mappings":"","file":"character-richtext.js","sourcesContent":["// import type { Graphic } from '../graphic/graphic';\n// import { GraphicRichText } from '../graphic/richtext';\n// import { CharacterComponent } from '../character';\n// import { StoryComponentType } from '../../../../constants/character';\n\n// export class CharacterComponentRichText extends CharacterComponent {\n//   readonly graphicType: string = 'richtext';\n//   protected _createGraphic(): Graphic {\n//     return new GraphicRichText(StoryComponentType.RICH_TEXT, this as any);\n//   }\n// }\n"]}

package/es/story/character/component/characters/character-text.js

@@ -1,4 +1,4 @@
-import { GraphicPureText } from "../graphic/text";
+import { GraphicText } from "../graphic/text";
 
 import { CharacterComponent } from "../character";
 
@@ -9,7 +9,7 @@ export class CharacterComponentText extends CharacterComponent {
         super(...arguments), this.graphicType = "text";
     }
     _createGraphic() {
-        return new GraphicPureText(StoryComponentType.TEXT, this);
+        return new GraphicText(StoryComponentType.TEXT, this);
     }
 }
 //# sourceMappingURL=character-text.js.map

package/es/story/character/component/characters/character-text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/characters/character-text.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAKrE,MAAM,OAAO,sBAAuB,SAAQ,kBAAkB;IAA9D;;QACW,gBAAW,GAAW,MAAM,CAAC;IAIxC,CAAC;IAHW,cAAc;QACtB,OAAO,IAAI,eAAe,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAW,CAAC,CAAC;IACnE,CAAC;CACF","file":"character-text.js","sourcesContent":["import type { Graphic } from '../graphic/graphic';\nimport { GraphicPureText } from '../graphic/text';\nimport { CharacterComponent } from '../character';\nimport { StoryComponentType } from '../../../../constants/character';\n\n/**\n * text component 没有关联 graphic，逻辑与 GraphicText 有所不同\n */\nexport class CharacterComponentText extends CharacterComponent {\n  readonly graphicType: string = 'text';\n  protected _createGraphic(): Graphic {\n    return new GraphicPureText(StoryComponentType.TEXT, this as any);\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/characters/character-text.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAKrE,MAAM,OAAO,sBAAuB,SAAQ,kBAAkB;IAA9D;;QACW,gBAAW,GAAW,MAAM,CAAC;IAIxC,CAAC;IAHW,cAAc;QACtB,OAAO,IAAI,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAW,CAAC,CAAC;IAC/D,CAAC;CACF","file":"character-text.js","sourcesContent":["import type { Graphic } from '../graphic/graphic';\nimport { GraphicText } from '../graphic/text';\nimport { CharacterComponent } from '../character';\nimport { StoryComponentType } from '../../../../constants/character';\n\n/**\n * text component 没有关联 graphic，逻辑与 GraphicText 有所不同\n */\nexport class CharacterComponentText extends CharacterComponent {\n  readonly graphicType: string = 'text';\n  protected _createGraphic(): Graphic {\n    return new GraphicText(StoryComponentType.TEXT, this as any);\n  }\n}\n"]}

package/es/story/character/component/graphic/graphic-base-text.d.ts

@@ -0,0 +1,23 @@
+import type { IWidgetData } from '../../dsl-interface';
+import type { IRichTextGraphicAttribute } from '@visactor/vrender';
+import type { CharacterComponent } from '../character';
+export declare const MAX_LAYOUT_SIZE = 999999;
+export declare class GraphicBaseText {
+    private _character;
+    private _graphic;
+    constructor(graphicCharacter: CharacterComponent);
+    getInitialAttributes(): IRichTextGraphicAttribute & {
+        graphicAlign: string;
+        graphicBaseline: string;
+    };
+    show(): void;
+    hide(): void;
+    transformTextAttrsToRichTextConfig(): import("@visactor/vrender").IRichTextCharacter[];
+    init(): void;
+    applyGraphicAttribute(graphicAttribute: Partial<IRichTextGraphicAttribute>): void;
+    getGraphicAttribute(): IRichTextGraphicAttribute;
+    updateAttribute: (attribute: Partial<IRichTextGraphicAttribute>) => void;
+    applyLayoutData(w: Partial<IWidgetData>): void;
+    private _updateGraphicCharacterSize;
+    private _transformTextAttributes;
+}

package/es/story/character/component/graphic/{graphic-text.js → graphic-base-text.js}

@@ -1,16 +1,32 @@
 import { getLayoutFromWidget } from "../../../utils/layout";
 
-import { createText } from "@visactor/vrender";
+import { createRichText } from "@visactor/vrender";
 
 export const MAX_LAYOUT_SIZE = 999999;
 
-export class GraphicText {
+export class GraphicBaseText {
     constructor(graphicCharacter) {
         this.updateAttribute = attribute => {
             attribute && (this._graphic.setAttributes(this._transformTextAttributes(attribute)), 
             this._updateGraphicCharacterSize());
         }, this._character = graphicCharacter;
     }
+    getInitialAttributes() {
+        return {
+            visible: !0,
+            x: 0,
+            y: 0,
+            textAlign: "center",
+            textBaseline: "middle",
+            textConfig: [],
+            fontSize: 16,
+            graphicAlign: "center",
+            graphicBaseline: "middle",
+            ignoreBuf: !0,
+            maxLineWidth: 999999,
+            heightLimit: 999999
+        };
+    }
     show() {
         this._graphic.setAttributes({
             visible: !0
@@ -21,24 +37,23 @@ export class GraphicText {
             visible: !1
         });
     }
-    init() {
+    transformTextAttrsToRichTextConfig() {
         var _a, _b;
-        this._graphic = createText(this._transformTextAttributes(Object.assign(Object.assign({
-            visible: !0,
-            x: 0,
-            y: 0,
-            textAlign: "center",
-            textBaseline: "middle",
-            text: null,
-            fontSize: 16,
-            whiteSpace: "normal",
-            graphicAlign: "center",
-            graphicBaseline: "middle",
-            fill: "#000000",
-            ignoreBuf: !0
-        }, null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.text) && void 0 !== _b ? _b : {}), {
-            maxLineWidth: 999999,
-            heightLimit: 999999
+        const textAttr = null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.text) && void 0 !== _b ? _b : {};
+        let textConfig = textAttr.textConfig;
+        if ((!textConfig || !textConfig.length) && textAttr.text) {
+            const textList = Array.isArray(textAttr.text) ? textAttr.text : [ textAttr.text ];
+            textConfig = textList.map(((item, i) => ({
+                textAlign: "center",
+                textBaseline: "middle",
+                text: item + (i < textList.length - 1 ? "\n" : "")
+            })));
+        }
+        return textConfig;
+    }
+    init() {
+        this._graphic = createRichText(this._transformTextAttributes(Object.assign(Object.assign({}, this.getInitialAttributes()), {
+            textConfig: this.transformTextAttrsToRichTextConfig()
         }))), this._character.getGraphicParent().add(this._graphic);
     }
     applyGraphicAttribute(graphicAttribute) {
@@ -83,7 +98,8 @@ export class GraphicText {
             angle: layoutData.angle,
             anchor: [ layoutData.width / 2, layoutData.height / 2 ],
             scaleCenter: [ layoutData.width / 2, layoutData.height / 2 ],
-            maxLineWidth: right - left,
+            maxWidth: layoutData.width,
+            maxHeight: layoutData.height,
             heightLimit: this._character.graphic.getGraphicAttribute().isResized ? bottom - top : 999999
         }));
     }
@@ -94,4 +110,4 @@ export class GraphicText {
         return attributes;
     }
 }
-//# sourceMappingURL=graphic-text.js.map
+//# sourceMappingURL=graphic-base-text.js.map

package/es/story/character/component/graphic/graphic-base-text.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/story/character/component/graphic/graphic-base-text.ts"],"names":[],"mappings":"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","file":"graphic-base-text.js","sourcesContent":["import { getLayoutFromWidget } from '../../../utils/layout';\nimport type { IWidgetData } from '../../dsl-interface';\nimport type { IRichText, IRichTextGraphicAttribute, TextAlignType, TextBaselineType } from '@visactor/vrender';\nimport { createRichText, createText } from '@visactor/vrender';\nimport type { CharacterComponent } from '../character';\n\nexport const MAX_LAYOUT_SIZE = 999999;\n\nexport class GraphicBaseText {\n  private _character: CharacterComponent;\n  private _graphic: IRichText;\n  constructor(graphicCharacter: CharacterComponent) {\n    this._character = graphicCharacter;\n  }\n\n  getInitialAttributes(): IRichTextGraphicAttribute & { graphicAlign: string; graphicBaseline: string } {\n    return {\n      visible: true,\n      x: 0,\n      y: 0,\n      textAlign: 'center',\n      textBaseline: 'middle',\n      textConfig: [],\n      fontSize: 16,\n      // fill: '#000000',\n      // whiteSpace: 'normal',\n      graphicAlign: 'center',\n      graphicBaseline: 'middle',\n      // // compute real height without vrender buffer\n      ignoreBuf: true,\n      maxLineWidth: MAX_LAYOUT_SIZE,\n      heightLimit: MAX_LAYOUT_SIZE\n    };\n  }\n\n  show(): void {\n    this._graphic.setAttributes({\n      visible: true\n      // visibleAll: true,\n    });\n  }\n  hide(): void {\n    this._graphic.setAttributes({\n      visible: false\n      // visibleAll: false,\n    });\n  }\n\n  transformTextAttrsToRichTextConfig() {\n    const textAttr = (this._character.spec.options?.text ?? {}) as IRichTextGraphicAttribute;\n    let textConfig = textAttr.textConfig;\n\n    // 如果是纯文本定义方式\n    if (!(textConfig && textConfig.length) && textAttr.text) {\n      const textList = Array.isArray(textAttr.text) ? textAttr.text : [textAttr.text];\n      textConfig = textList.map((item, i) => {\n        return {\n          textAlign: 'center',\n          textBaseline: 'middle',\n          // ...((textAttr || {}) as any),\n          text: item + (i < textList.length - 1 ? '\\n' : '')\n        };\n      });\n    }\n\n    return textConfig;\n  }\n\n  init() {\n    this._graphic = createRichText(\n      this._transformTextAttributes({\n        ...this.getInitialAttributes(),\n        textConfig: this.transformTextAttrsToRichTextConfig()\n      } as any)\n    );\n    this._character.getGraphicParent().add(this._graphic);\n  }\n\n  applyGraphicAttribute(graphicAttribute: Partial<IRichTextGraphicAttribute>): void {\n    this._graphic.setAttributes({ ...graphicAttribute });\n  }\n\n  getGraphicAttribute(): IRichTextGraphicAttribute {\n    return this._graphic?.attribute;\n  }\n\n  updateAttribute = (attribute: Partial<IRichTextGraphicAttribute>): void => {\n    if (attribute) {\n      this._graphic.setAttributes(this._transformTextAttributes(attribute));\n      this._updateGraphicCharacterSize();\n    }\n  };\n\n  applyLayoutData(w: Partial<IWidgetData>): void {\n    const layoutData = getLayoutFromWidget(w);\n    const layoutRatio = this._character.getTextLayoutRatio();\n    const graphicAlign = (this._graphic.attribute as any).graphicAlign;\n    const graphicBaseline = (this._graphic.attribute as any).graphicBaseline;\n    const left = layoutData.width * layoutRatio.left;\n    const right = layoutData.width * layoutRatio.right;\n    const center = (left + right) / 2;\n    const top = layoutData.height * layoutRatio.top;\n    const bottom = layoutData.height * layoutRatio.bottom;\n    const middle = (top + bottom) / 2;\n    let x = center;\n    let align: TextAlignType = 'center';\n    let y = middle;\n    let baseline: TextBaselineType = 'middle';\n    switch (graphicAlign) {\n      case 'left':\n        x = left;\n        align = 'left';\n        break;\n      case 'center':\n        x = center;\n        align = 'center';\n        break;\n      case 'right':\n        x = right;\n        align = 'right';\n        break;\n    }\n    switch (graphicBaseline) {\n      case 'top':\n        y = top;\n        baseline = 'top';\n        break;\n      case 'middle':\n        y = middle;\n        baseline = 'middle';\n        break;\n      case 'bottom':\n        y = bottom;\n        baseline = 'bottom';\n        break;\n    }\n\n    this._graphic.setAttributes(\n      this._transformTextAttributes({\n        x,\n        y,\n        textAlign: align,\n        textBaseline: baseline,\n        angle: layoutData.angle,\n        anchor: [layoutData.width / 2, layoutData.height / 2],\n        scaleCenter: [layoutData.width / 2, layoutData.height / 2],\n        maxWidth: layoutData.width,\n        maxHeight: layoutData.height,\n        heightLimit: this._character.graphic.getGraphicAttribute().isResized ? bottom - top : MAX_LAYOUT_SIZE\n      })\n    );\n  }\n\n  private _updateGraphicCharacterSize() {\n    if (!this._character.graphic.getGraphicAttribute().isResized) {\n      // const layoutRatio = this._character.graphic.getTextLayoutRatio();\n      // const textHeight = this._graphic.AABBBounds.height();\n      // const minGraphicHeight = this._character.graphic.getInitialAttributes().height;\n      // const graphicHeight = Math.max(textHeight / (layoutRatio.bottom - layoutRatio.top), minGraphicHeight);\n      // this._character.graphic.applyLayoutData({\n      //   height: graphicHeight\n      // });\n      this.applyLayoutData(this._character.graphic.getPositionData());\n    }\n  }\n\n  private _transformTextAttributes(attributes: IRichTextGraphicAttribute): IRichTextGraphicAttribute {\n    return attributes;\n  }\n}\n"]}

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

@@ -8,7 +8,7 @@ export interface IGraphicConstructor {
 export declare abstract class Graphic {
     readonly containsShapePoints: boolean;
     type: string;
-    protected _character: CharacterComponent;
+    protected _character: any;
     protected _graphic: IGraphic<any>;
     get graphic(): IGraphic<any>;
     constructor(type: string, character: CharacterComponent);

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/graphic/graphic.ts"],"names":[],"mappings":"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","file":"graphic.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender';\nimport type { IAABBBounds, IPointLike } from '@visactor/vutils';\nimport { isValid } from '@visactor/vutils';\nimport type { CharacterComponent } from '../character';\nimport type { IComponentCharacterSpec, IWidgetData } from '../..';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport interface IGraphicConstructor {\n  new (type: string, character: CharacterComponent): Graphic;\n}\n\nexport abstract class Graphic {\n  readonly containsShapePoints: boolean = false;\n  type: string;\n\n  protected _character: CharacterComponent;\n  protected _graphic: IGraphic<any>;\n  get graphic() {\n    return this._graphic;\n  }\n  // protected _group: IGraphic<any>;\n\n  constructor(type: string, character: CharacterComponent) {\n    this.type = type;\n    this._character = character;\n  }\n\n  abstract init(): void;\n\n  getBounds(): IAABBBounds {\n    return this._graphic.AABBBounds;\n  }\n\n  release() {\n    if (this._graphic) {\n      this._graphic.parent.removeChild(this._graphic);\n      this._graphic = null;\n    }\n  }\n\n  getInitialAttributes(): any {\n    return {\n      x: 0,\n      y: 0,\n      width: 120,\n      height: 80,\n      angle: 0,\n      anchor: [60, 40],\n      lineWidth: 2,\n      stroke: '#000000',\n      shapePoints: [] as IPointLike[]\n    };\n  }\n\n  setAttributes(attr: Record<string, any>): void {\n    if (!this._graphic) {\n      return;\n    }\n    this._graphic.setAttributes(attr);\n  }\n\n  show(): void {\n    this._graphic.setAttributes({\n      visible: true,\n      visibleAll: true\n    });\n  }\n  hide(): void {\n    this._graphic.setAttributes({\n      visible: false,\n      visibleAll: false\n    });\n  }\n\n  getGraphicAttribute(): IComponentCharacterSpec['options']['graphic'] {\n    return this._graphic?.attribute;\n  }\n\n  applyGraphicAttribute(graphicAttribute: IComponentCharacterSpec['options']['graphic']): void {\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        ...graphicAttribute\n      })\n    );\n  }\n\n  getPositionData() {\n    return {\n      x: this._graphic.attribute.x,\n      y: this._graphic.attribute.y,\n      width: this._graphic.attribute.width,\n      height: this._graphic.attribute.height,\n      angle: this._graphic.attribute.angle,\n      shapePoints: this._graphic.attribute.shapePoints\n    };\n  }\n\n  applyLayoutData(layoutData: Partial<IWidgetData>): void {\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        ...getLayoutFromWidget(layoutData),\n        shapePoints: this._character.spec.options.shapePoints\n      })\n    );\n  }\n\n  getTextLayoutRatio(): { left: number; right: number; top: number; bottom: number } {\n    return {\n      left: 0,\n      right: 1,\n      top: 0,\n      bottom: 1\n    };\n  }\n\n  protected _transformAttributes(attributes: any): any {\n    // const x = attributes.x ?? this._graphic?.attribute.x;\n    // const y = attributes.y ?? this._graphic?.attribute.y;\n    const width = attributes.width ?? this._graphic?.attribute.width;\n    const height = attributes.height ?? this._graphic?.attribute.height;\n\n    const transformedAttributes = Object.assign({}, attributes);\n    Object.keys(transformedAttributes).forEach(key => {\n      if (!isValid(attributes[key])) {\n        delete transformedAttributes[key];\n      }\n    });\n    transformedAttributes.anchor = [width / 2, height / 2];\n    transformedAttributes.scaleCenter = [width / 2, height / 2];\n    transformedAttributes.x = 0;\n    transformedAttributes.y = 0;\n    return transformedAttributes;\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/graphic/graphic.ts"],"names":[],"mappings":"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","file":"graphic.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender';\nimport type { IAABBBounds, IPointLike } from '@visactor/vutils';\nimport { isValid } from '@visactor/vutils';\nimport type { CharacterComponent } from '../character';\nimport type { IComponentCharacterSpec, IWidgetData } from '../..';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport interface IGraphicConstructor {\n  new (type: string, character: CharacterComponent): Graphic;\n}\n\nexport abstract class Graphic {\n  readonly containsShapePoints: boolean = false;\n  type: string;\n\n  protected _character: any;\n  protected _graphic: IGraphic<any>;\n  get graphic() {\n    return this._graphic;\n  }\n  // protected _group: IGraphic<any>;\n\n  constructor(type: string, character: CharacterComponent) {\n    this.type = type;\n    this._character = character;\n  }\n\n  abstract init(): void;\n\n  getBounds(): IAABBBounds {\n    return this._graphic.AABBBounds;\n  }\n\n  release() {\n    if (this._graphic) {\n      this._graphic.parent.removeChild(this._graphic);\n      this._graphic = null;\n    }\n  }\n\n  getInitialAttributes(): any {\n    return {\n      x: 0,\n      y: 0,\n      width: 120,\n      height: 80,\n      angle: 0,\n      anchor: [60, 40],\n      lineWidth: 2,\n      stroke: '#000000',\n      shapePoints: [] as IPointLike[]\n    };\n  }\n\n  setAttributes(attr: Record<string, any>): void {\n    if (!this._graphic) {\n      return;\n    }\n    this._graphic.setAttributes(attr);\n  }\n\n  show(): void {\n    this._graphic.setAttributes({\n      visible: true,\n      visibleAll: true\n    });\n  }\n  hide(): void {\n    this._graphic.setAttributes({\n      visible: false,\n      visibleAll: false\n    });\n  }\n\n  getGraphicAttribute(): IComponentCharacterSpec['options']['graphic'] {\n    return this._graphic?.attribute;\n  }\n\n  applyGraphicAttribute(graphicAttribute: IComponentCharacterSpec['options']['graphic']): void {\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        ...graphicAttribute\n      })\n    );\n  }\n\n  getPositionData() {\n    return {\n      x: this._graphic.attribute.x,\n      y: this._graphic.attribute.y,\n      width: this._graphic.attribute.width,\n      height: this._graphic.attribute.height,\n      angle: this._graphic.attribute.angle,\n      shapePoints: this._graphic.attribute.shapePoints\n    };\n  }\n\n  applyLayoutData(layoutData: Partial<IWidgetData>): void {\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        ...getLayoutFromWidget(layoutData),\n        shapePoints: this._character.spec.options.shapePoints\n      })\n    );\n  }\n\n  getTextLayoutRatio(): { left: number; right: number; top: number; bottom: number } {\n    return {\n      left: 0,\n      right: 1,\n      top: 0,\n      bottom: 1\n    };\n  }\n\n  protected _transformAttributes(attributes: any): any {\n    // const x = attributes.x ?? this._graphic?.attribute.x;\n    // const y = attributes.y ?? this._graphic?.attribute.y;\n    const width = attributes.width ?? this._graphic?.attribute.width;\n    const height = attributes.height ?? this._graphic?.attribute.height;\n\n    const transformedAttributes = Object.assign({}, attributes);\n    Object.keys(transformedAttributes).forEach(key => {\n      if (!isValid(attributes[key])) {\n        delete transformedAttributes[key];\n      }\n    });\n    transformedAttributes.anchor = [width / 2, height / 2];\n    transformedAttributes.scaleCenter = [width / 2, height / 2];\n    transformedAttributes.x = 0;\n    transformedAttributes.y = 0;\n    return transformedAttributes;\n  }\n}\n"]}

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

@@ -1,9 +1 @@
-import type { IRichText, IRichTextAttribute } from '@visactor/vrender';
-import { Graphic } from './graphic';
-import type { IWidgetData } from '../../dsl-interface';
-export declare class GraphicRichText extends Graphic {
-    protected _graphic: IRichText;
-    getInitialAttributes(): Partial<IRichTextAttribute>;
-    init(): void;
-    applyLayoutData(w: Partial<IWidgetData>): void;
-}
+