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

package/cjs/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/cjs/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/cjs/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;
-}
+

package/cjs/story/character/component/graphic/richtext.js

@@ -1,48 +1,3 @@
-"use strict";
 
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.GraphicRichText = void 0;
 
-const vrender_1 = require("@visactor/vrender"), graphic_1 = require("./graphic"), layout_1 = require("../../../utils/layout");
-
-class GraphicRichText extends graphic_1.Graphic {
-    getInitialAttributes() {
-        return {
-            x: 0,
-            y: 0,
-            width: 120,
-            height: 80,
-            maxWidth: 120,
-            maxHeight: 80,
-            angle: 0,
-            fontSize: 16,
-            textAlign: "center",
-            textBaseline: "middle",
-            fill: "#000000",
-            lineWidth: 2,
-            ignoreBuf: !0,
-            stroke: !1,
-            ellipsis: !0,
-            textConfig: []
-        };
-    }
-    init() {
-        var _a, _b;
-        this._graphic || (this._graphic = (0, vrender_1.createRichText)(this._transformAttributes(Object.assign(Object.assign({}, this.getInitialAttributes()), null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.graphic) && void 0 !== _b ? _b : {}))), 
-        this._graphic.name = `graphic-richtext-${this._character.id}`, this._character.getGraphicParent().add(this._graphic));
-    }
-    applyLayoutData(w) {
-        const {x: x, y: y, width: width, height: height, angle: angle} = (0, layout_1.getLayoutFromWidget)(w);
-        this._graphic.setAttributes(this._transformAttributes({
-            x: x,
-            y: y,
-            angle: angle,
-            maxWidth: width,
-            maxHeight: height
-        }));
-    }
-}
-
-exports.GraphicRichText = GraphicRichText;
 //# sourceMappingURL=richtext.js.map

package/cjs/story/character/component/graphic/richtext.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/graphic/richtext.ts"],"names":[],"mappings":";;;AACA,+CAAmD;AACnD,uCAAoC;AAEpC,kDAA4D;AAE5D,MAAa,eAAgB,SAAQ,iBAAO;IAG1C,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,GAAG;YACb,SAAS,EAAE,EAAE;YACb,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,EAAE;SACgB,CAAC;IACnC,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAA,wBAAc,EAC5B,IAAI,CAAC,oBAAoB,iCACpB,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,EAChD,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,oBAAoB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YAC9D,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAED,eAAe,CAAC,CAAuB;QACrC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAmB,EAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,aAAa,CACzB,IAAI,CAAC,oBAAoB,CAAC;YACxB,CAAC;YACD,CAAC;YACD,KAAK;YACL,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,MAAM;SAClB,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAjDD,0CAiDC","file":"richtext.js","sourcesContent":["import type { IRichText, IRichTextAttribute } from '@visactor/vrender';\nimport { createRichText } from '@visactor/vrender';\nimport { Graphic } from './graphic';\nimport type { IWidgetData } from '../../dsl-interface';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport class GraphicRichText extends Graphic {\n  protected _graphic: IRichText;\n\n  getInitialAttributes() {\n    return {\n      x: 0,\n      y: 0,\n      width: 120,\n      height: 80,\n      maxWidth: 120,\n      maxHeight: 80,\n      angle: 0,\n      fontSize: 16,\n      textAlign: 'center',\n      textBaseline: 'middle',\n      fill: '#000000',\n      lineWidth: 2,\n      ignoreBuf: true,\n      stroke: false,\n      ellipsis: true,\n      textConfig: []\n    } as Partial<IRichTextAttribute>;\n  }\n\n  init() {\n    if (!this._graphic) {\n      this._graphic = createRichText(\n        this._transformAttributes({\n          ...this.getInitialAttributes(),\n          ...(this._character.spec.options?.graphic ?? {})\n        })\n      );\n      this._graphic.name = `graphic-richtext-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n\n  applyLayoutData(w: Partial<IWidgetData>) {\n    const { x, y, width, height, angle } = getLayoutFromWidget(w);\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        x,\n        y,\n        angle,\n        maxWidth: width,\n        maxHeight: height\n      })\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/graphic/richtext.ts"],"names":[],"mappings":"","file":"richtext.js","sourcesContent":["// import type { IRichText, IRichTextAttribute } from '@visactor/vrender';\n// import { createRichText } from '@visactor/vrender';\n// import { Graphic } from './graphic';\n// import type { IWidgetData } from '../../dsl-interface';\n// import { getLayoutFromWidget } from '../../../utils/layout';\n\n// export class GraphicRichText extends Graphic {\n//   protected _graphic: IRichText;\n\n//   getInitialAttributes() {\n//     return {\n//       x: 0,\n//       y: 0,\n//       width: 120,\n//       height: 80,\n//       maxWidth: 120,\n//       maxHeight: 80,\n//       angle: 0,\n//       fontSize: 16,\n//       textAlign: 'center',\n//       textBaseline: 'middle',\n//       fill: '#000000',\n//       lineWidth: 2,\n//       ignoreBuf: true,\n//       stroke: false,\n//       ellipsis: true,\n//       textConfig: []\n//     } as Partial<IRichTextAttribute>;\n//   }\n\n//   init() {\n//     if (!this._graphic) {\n//       this._graphic = createRichText(\n//         this._transformAttributes({\n//           ...this.getInitialAttributes(),\n//           ...(this._character.spec.options?.graphic ?? {})\n//         })\n//       );\n//       this._graphic.name = `graphic-richtext-${this._character.id}`;\n//       this._character.getGraphicParent().add(this._graphic);\n//     }\n//   }\n\n//   applyLayoutData(w: Partial<IWidgetData>) {\n//     const { x, y, width, height, angle } = getLayoutFromWidget(w);\n//     this._graphic.setAttributes(\n//       this._transformAttributes({\n//         x,\n//         y,\n//         angle,\n//         maxWidth: width,\n//         maxHeight: height\n//       })\n//     );\n//   }\n// }\n"]}

package/cjs/story/character/component/graphic/symbol.d.ts

@@ -1,6 +1,7 @@
 import type { ISymbol } from '@visactor/vrender';
 import type { IPointLike } from '@visactor/vutils';
 import { Graphic } from './graphic';
+import type { IWidgetData } from '../../dsl-interface';
 export declare class GraphicSymbol extends Graphic {
     protected _graphic: ISymbol;
     getInitialAttributes(): {
@@ -16,4 +17,6 @@ export declare class GraphicSymbol extends Graphic {
         symbolType: string;
     };
     init(): void;
+    applyLayoutData(layoutData: Partial<IWidgetData>): void;
+    protected _transformAttributes(attributes: any): any;
 }

package/cjs/story/character/component/graphic/symbol.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.GraphicSymbol = void 0;
 
-const vrender_1 = require("@visactor/vrender"), graphic_1 = require("./graphic");
+const vrender_1 = require("@visactor/vrender"), graphic_1 = require("./graphic"), layout_1 = require("../../../utils/layout");
 
 class GraphicSymbol extends graphic_1.Graphic {
     getInitialAttributes() {
@@ -23,8 +23,22 @@ class GraphicSymbol extends graphic_1.Graphic {
     }
     init() {
         var _a, _b;
-        this._graphic || (this._graphic = (0, vrender_1.createSymbol)(this._transformAttributes(Object.assign(Object.assign({}, this.getInitialAttributes()), null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.graphic) && void 0 !== _b ? _b : {}))), 
-        this._graphic.name = `graphic-symbol-${this._character.id}`, this._character.getGraphicParent().add(this._graphic));
+        if (!this._graphic) {
+            const attributes = this._transformAttributes(Object.assign(Object.assign({}, this.getInitialAttributes()), null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.graphic) && void 0 !== _b ? _b : {}));
+            this._graphic = (0, vrender_1.createSymbol)(attributes), this._graphic.name = `graphic-symbol-${this._character.id}`, 
+            this._character.getGraphicParent().add(this._graphic);
+        }
+    }
+    applyLayoutData(layoutData) {
+        const attributes = this._transformAttributes(Object.assign(Object.assign({}, (0, 
+        layout_1.getLayoutFromWidget)(layoutData)), {
+            shapePoints: this._character.spec.options.shapePoints
+        }));
+        attributes.size = Math.min(attributes.width, attributes.height), this._graphic.setAttributes(attributes);
+    }
+    _transformAttributes(attributes) {
+        const data = super._transformAttributes(attributes), {width: width, height: height} = attributes;
+        return data.x = width / 2, data.y = height / 2, data;
     }
 }
 

package/cjs/story/character/component/graphic/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/graphic/symbol.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,uCAAoC;AAEpC,MAAa,aAAc,SAAQ,iBAAO;IAGxC,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YAChB,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,EAAkB;YAC/B,UAAU,EAAE,QAAQ;SACrB,CAAC;IACJ,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAA,sBAAY,EAC1B,IAAI,CAAC,oBAAoB,iCACpB,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,EAChD,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,kBAAkB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;CACF;AA9BD,sCA8BC","file":"symbol.js","sourcesContent":["import type { ISymbol } from '@visactor/vrender';\nimport { createSymbol } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport { Graphic } from './graphic';\n\nexport class GraphicSymbol extends Graphic {\n  protected _graphic: ISymbol;\n\n  getInitialAttributes() {\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      symbolType: 'circle'\n    };\n  }\n\n  init() {\n    if (!this._graphic) {\n      this._graphic = createSymbol(\n        this._transformAttributes({\n          ...this.getInitialAttributes(),\n          ...(this._character.spec.options?.graphic ?? {})\n        })\n      );\n      this._graphic.name = `graphic-symbol-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/graphic/symbol.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,uCAAoC;AAEpC,kDAA4D;AAE5D,MAAa,aAAc,SAAQ,iBAAO;IAGxC,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YAChB,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,EAAkB;YAC/B,UAAU,EAAE,QAAQ;SACrB,CAAC;IACJ,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,iCACvC,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,EAChD,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,IAAA,sBAAY,EAAC,UAAU,CAAC,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,kBAAkB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,iCACvC,IAAA,4BAAmB,EAAC,UAAU,CAAC,KAClC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,IACrD,CAAC;QACH,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAES,oBAAoB,CAAC,UAAe;QAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QACrC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA/CD,sCA+CC","file":"symbol.js","sourcesContent":["import type { ISymbol } from '@visactor/vrender';\nimport { createSymbol } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport { Graphic } from './graphic';\nimport type { IWidgetData } from '../../dsl-interface';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport class GraphicSymbol extends Graphic {\n  protected _graphic: ISymbol;\n\n  getInitialAttributes() {\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      symbolType: 'circle'\n    };\n  }\n\n  init() {\n    if (!this._graphic) {\n      const attributes = this._transformAttributes({\n        ...this.getInitialAttributes(),\n        ...(this._character.spec.options?.graphic ?? {})\n      });\n      this._graphic = createSymbol(attributes);\n      this._graphic.name = `graphic-symbol-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n\n  applyLayoutData(layoutData: Partial<IWidgetData>): void {\n    const attributes = this._transformAttributes({\n      ...getLayoutFromWidget(layoutData),\n      shapePoints: this._character.spec.options.shapePoints\n    });\n    attributes.size = Math.min(attributes.width, attributes.height);\n\n    this._graphic.setAttributes(attributes);\n  }\n\n  protected _transformAttributes(attributes: any): any {\n    const data = super._transformAttributes(attributes);\n    const { width, height } = attributes;\n    data.x = width / 2;\n    data.y = height / 2;\n    return data;\n  }\n}\n"]}

package/cjs/story/character/component/graphic/text.d.ts

@@ -1,9 +1,9 @@
-import type { IText } from '@visactor/vrender';
+import type { IRichText } from '@visactor/vrender';
 import type { IPointLike } from '@visactor/vutils';
 import { Graphic } from './graphic';
 import type { IWidgetData } from '../../dsl-interface';
-export declare class GraphicPureText extends Graphic {
-    protected _graphic: IText;
+export declare class GraphicText extends Graphic {
+    protected _graphic: IRichText;
     getInitialAttributes(): {
         x: number;
         y: number;
@@ -19,6 +19,7 @@ export declare class GraphicPureText extends Graphic {
         stroke: boolean;
         shapePoints: IPointLike[];
     };
+    transformTextAttrsToRichTextConfig(): import("@visactor/vrender").IRichTextCharacter[];
     init(): void;
     applyLayoutData(w: Partial<IWidgetData>): void;
 }

package/cjs/story/character/component/graphic/text.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.GraphicPureText = void 0;
+}), exports.GraphicText = void 0;
 
-const vrender_1 = require("@visactor/vrender"), graphic_1 = require("./graphic"), layout_1 = require("../../../utils/layout");
+const vrender_1 = require("@visactor/vrender"), graphic_1 = require("./graphic"), layout_1 = require("../../../utils/layout"), richtextCombinedAttrs = [ "fill", "stroke", "fontSize", "fontFamily", "fontStyle", "fontWeight", "lineWidth", "opacity", "fillOpacity", "strokeOpacity" ];
 
-class GraphicPureText extends graphic_1.Graphic {
+class GraphicText extends graphic_1.Graphic {
     getInitialAttributes() {
         return {
             x: 0,
@@ -24,10 +24,25 @@ class GraphicPureText extends graphic_1.Graphic {
             shapePoints: []
         };
     }
+    transformTextAttrsToRichTextConfig() {
+        var _a, _b;
+        const textAttr = null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.graphic) && 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: textAttr.textAlign,
+                textBaseline: textAttr.textBaseline,
+                text: item + (i < textList.length - 1 ? "\n" : "")
+            })));
+        }
+        return textConfig;
+    }
     init() {
         var _a, _b;
-        this._graphic || (this._graphic = (0, vrender_1.createText)(this._transformAttributes(Object.assign(Object.assign({}, this.getInitialAttributes()), null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.graphic) && void 0 !== _b ? _b : {}))), 
-        this._graphic.name = `graphic-text-${this._character.id}`, this._character.getGraphicParent().add(this._graphic));
+        this._graphic || (this._graphic = (0, vrender_1.createRichText)(this._transformAttributes(Object.assign(Object.assign(Object.assign({}, this.getInitialAttributes()), null !== (_b = null === (_a = this._character.spec.options) || void 0 === _a ? void 0 : _a.graphic) && void 0 !== _b ? _b : {}), {
+            textConfig: this.transformTextAttrsToRichTextConfig()
+        }))), this._graphic.name = `graphic-text-${this._character.id}`, this._character.getGraphicParent().add(this._graphic));
     }
     applyLayoutData(w) {
         const {x: x, y: y, width: width, height: height, angle: angle} = (0, layout_1.getLayoutFromWidget)(w);
@@ -43,5 +58,5 @@ class GraphicPureText extends graphic_1.Graphic {
     }
 }
 
-exports.GraphicPureText = GraphicPureText;
+exports.GraphicText = GraphicText;
 //# sourceMappingURL=text.js.map

package/cjs/story/character/component/graphic/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/graphic/text.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAE/C,uCAAoC;AAEpC,kDAA4D;AAE5D,MAAa,eAAgB,SAAQ,iBAAO;IAG1C,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,EAAkB;SAChC,CAAC;IACJ,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAA,oBAAU,EACxB,IAAI,CAAC,oBAAoB,iCACpB,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,EAChD,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,gBAAgB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YAC1D,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAED,eAAe,CAAC,CAAuB;QACrC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAmB,EAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,aAAa,CACzB,IAAI,CAAC,oBAAoB,CAAC;YACxB,CAAC;YACD,CAAC;YACD,KAAK;YACL,KAAK;YACL,MAAM;YACN,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,MAAM;SACpB,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAhDD,0CAgDC","file":"text.js","sourcesContent":["import type { IText } from '@visactor/vrender';\nimport { createText } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport { Graphic } from './graphic';\nimport type { IWidgetData } from '../../dsl-interface';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport class GraphicPureText extends Graphic {\n  protected _graphic: IText;\n\n  getInitialAttributes() {\n    return {\n      x: 0,\n      y: 0,\n      width: 120,\n      height: 80,\n      angle: 0,\n      fontSize: 16,\n      textAlign: 'center',\n      textBaseline: 'middle',\n      fill: '#000000',\n      lineWidth: 2,\n      ignoreBuf: true,\n      stroke: false,\n      shapePoints: [] as IPointLike[]\n    };\n  }\n\n  init() {\n    if (!this._graphic) {\n      this._graphic = createText(\n        this._transformAttributes({\n          ...this.getInitialAttributes(),\n          ...(this._character.spec.options?.graphic ?? {})\n        })\n      );\n      this._graphic.name = `graphic-text-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n\n  applyLayoutData(w: Partial<IWidgetData>) {\n    const { x, y, width, height, angle } = getLayoutFromWidget(w);\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        x,\n        y,\n        angle,\n        width,\n        height,\n        maxLineWidth: width,\n        heightLimit: height\n      })\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/graphic/text.ts"],"names":[],"mappings":";;;AACA,+CAA+D;AAE/D,uCAAoC;AAEpC,kDAA4D;AAE5D,MAAM,qBAAqB,GAAG;IAC5B,MAAM;IACN,QAAQ;IACR,UAAU;IACV,YAAY;IACZ,WAAW;IACX,YAAY;IACZ,WAAW;IACX,SAAS;IACT,aAAa;IACb,eAAe;CAChB,CAAC;AAEF,MAAa,WAAY,SAAQ,iBAAO;IAGtC,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,EAAkB;SAChC,CAAC;IACJ,CAAC;IAED,kCAAkC;;QAChC,MAAM,QAAQ,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAA8B,CAAC;QAC5F,IAAI,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QAGrC,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE;YACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChF,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBACpC,OAAO;oBACL,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY;oBAEnC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;iBACnD,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAA,wBAAc,EAC5B,IAAI,CAAC,oBAAoB,+CACpB,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,KAChD,UAAU,EAAE,IAAI,CAAC,kCAAkC,EAAE,IACrD,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,gBAAgB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YAC1D,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAED,eAAe,CAAC,CAAuB;QACrC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAmB,EAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,aAAa,CACzB,IAAI,CAAC,oBAAoB,CAAC;YACxB,CAAC;YACD,CAAC;YACD,KAAK;YACL,KAAK;YACL,MAAM;YACN,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,MAAM;SACpB,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AArED,kCAqEC","file":"text.js","sourcesContent":["import type { IRichText, IRichTextGraphicAttribute, IText } from '@visactor/vrender';\nimport { createRichText, createText } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport { Graphic } from './graphic';\nimport type { IWidgetData } from '../../dsl-interface';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nconst richtextCombinedAttrs = [\n  'fill',\n  'stroke',\n  'fontSize',\n  'fontFamily',\n  'fontStyle',\n  'fontWeight',\n  'lineWidth',\n  'opacity',\n  'fillOpacity',\n  'strokeOpacity'\n];\n\nexport class GraphicText extends Graphic {\n  protected _graphic: IRichText;\n\n  getInitialAttributes() {\n    return {\n      x: 0,\n      y: 0,\n      width: 120,\n      height: 80,\n      angle: 0,\n      fontSize: 16,\n      textAlign: 'center',\n      textBaseline: 'middle',\n      fill: '#000000',\n      lineWidth: 2,\n      ignoreBuf: true,\n      stroke: false,\n      shapePoints: [] as IPointLike[]\n    };\n  }\n\n  transformTextAttrsToRichTextConfig() {\n    const textAttr = (this._character.spec.options?.graphic ?? {}) 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: textAttr.textAlign,\n          textBaseline: textAttr.textBaseline,\n          // ...((textAttr || {}) as any),\n          text: item + (i < textList.length - 1 ? '\\n' : '')\n        };\n      });\n    }\n\n    return textConfig;\n  }\n\n  init() {\n    if (!this._graphic) {\n      this._graphic = createRichText(\n        this._transformAttributes({\n          ...this.getInitialAttributes(),\n          ...(this._character.spec.options?.graphic ?? {}),\n          textConfig: this.transformTextAttrsToRichTextConfig()\n        })\n      );\n      this._graphic.name = `graphic-text-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n\n  applyLayoutData(w: Partial<IWidgetData>) {\n    const { x, y, width, height, angle } = getLayoutFromWidget(w);\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        x,\n        y,\n        angle,\n        width,\n        height,\n        maxLineWidth: width,\n        heightLimit: height\n      })\n    );\n  }\n}\n"]}

package/cjs/story/character/component/graphic/timeline.d.ts

@@ -7,6 +7,12 @@ export declare class GraphicTimeline extends Graphic {
         x: number;
         y: number;
         clipRange: number;
+        activeSymbolStyle: {
+            size: number;
+        };
+        activeLineStyle: {
+            lineWidth: number;
+        };
     };
     init(): void;
     applyLayoutData(w: Partial<IWidgetData>): void;

package/cjs/story/character/component/graphic/timeline.js

@@ -11,7 +11,13 @@ class GraphicTimeline extends graphic_1.Graphic {
         return {
             x: 0,
             y: 0,
-            clipRange: 0
+            clipRange: 0,
+            activeSymbolStyle: {
+                size: 26
+            },
+            activeLineStyle: {
+                lineWidth: 1.5
+            }
         };
     }
     init() {

package/cjs/story/character/component/graphic/timeline.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/component/graphic/timeline.ts"],"names":[],"mappings":";;;AAAA,qEAAwD;AAGxD,uCAAoC;AAEpC,kDAA4D;AAE5D,MAAa,eAAgB,SAAQ,iBAAO;IAG1C,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,SAAS,EAAE,CAAC;SACb,CAAC;IACJ,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAQ,CAC1B,IAAI,CAAC,oBAAoB,iCACpB,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,EAChD,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAED,eAAe,CAAC,CAAuB;QACrC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAmB,EAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,aAAa,CACzB,IAAI,CAAC,oBAAoB,CAAC;YACxB,CAAC;YACD,CAAC;YACD,KAAK;YACL,KAAK;YACL,MAAM;SACP,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AApCD,0CAoCC","file":"timeline.js","sourcesContent":["import { Timeline } from '@visactor/vrender-components';\nimport { createText } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport { Graphic } from './graphic';\nimport type { IWidgetData } from '../../dsl-interface';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport class GraphicTimeline extends Graphic {\n  protected _graphic: Timeline;\n\n  getInitialAttributes() {\n    return {\n      x: 0,\n      y: 0,\n      clipRange: 0\n    };\n  }\n\n  init() {\n    if (!this._graphic) {\n      this._graphic = new Timeline(\n        this._transformAttributes({\n          ...this.getInitialAttributes(),\n          ...(this._character.spec.options?.graphic ?? {})\n        })\n      );\n      this._graphic.name = `timeline-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n\n  applyLayoutData(w: Partial<IWidgetData>) {\n    const { x, y, width, height, angle } = getLayoutFromWidget(w);\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        x,\n        y,\n        angle,\n        width,\n        height\n      })\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/component/graphic/timeline.ts"],"names":[],"mappings":";;;AAAA,qEAAwD;AAGxD,uCAAoC;AAEpC,kDAA4D;AAE5D,MAAa,eAAgB,SAAQ,iBAAO;IAG1C,oBAAoB;QAClB,OAAO;YACL,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,SAAS,EAAE,CAAC;YACZ,iBAAiB,EAAE;gBACjB,IAAI,EAAE,EAAE;aACT;YACD,eAAe,EAAE;gBACf,SAAS,EAAE,GAAG;aACf;SACF,CAAC;IACJ,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAQ,CAC1B,IAAI,CAAC,oBAAoB,iCACpB,IAAI,CAAC,oBAAoB,EAAE,GAC3B,CAAC,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC,EAChD,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAED,eAAe,CAAC,CAAuB;QACrC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAmB,EAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,aAAa,CACzB,IAAI,CAAC,oBAAoB,CAAC;YACxB,CAAC;YACD,CAAC;YACD,KAAK;YACL,KAAK;YACL,MAAM;SACP,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AA1CD,0CA0CC","file":"timeline.js","sourcesContent":["import { Timeline } from '@visactor/vrender-components';\nimport { createText } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport { Graphic } from './graphic';\nimport type { IWidgetData } from '../../dsl-interface';\nimport { getLayoutFromWidget } from '../../../utils/layout';\n\nexport class GraphicTimeline extends Graphic {\n  protected _graphic: Timeline;\n\n  getInitialAttributes() {\n    return {\n      x: 0,\n      y: 0,\n      clipRange: 0,\n      activeSymbolStyle: {\n        size: 26\n      },\n      activeLineStyle: {\n        lineWidth: 1.5\n      }\n    };\n  }\n\n  init() {\n    if (!this._graphic) {\n      this._graphic = new Timeline(\n        this._transformAttributes({\n          ...this.getInitialAttributes(),\n          ...(this._character.spec.options?.graphic ?? {})\n        })\n      );\n      this._graphic.name = `timeline-${this._character.id}`;\n      this._character.getGraphicParent().add(this._graphic);\n    }\n  }\n\n  applyLayoutData(w: Partial<IWidgetData>) {\n    const { x, y, width, height, angle } = getLayoutFromWidget(w);\n    this._graphic.setAttributes(\n      this._transformAttributes({\n        x,\n        y,\n        angle,\n        width,\n        height\n      })\n    );\n  }\n}\n"]}

package/cjs/story/character/dsl-interface.d.ts

@@ -1,4 +1,5 @@
-import type { ITextGraphicAttribute } from '@visactor/vrender';
+import type { IInitOption } from '@visactor/vchart';
+import type { IRichTextGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender';
 import type { DirectionType } from './chart/const';
 export type IPercent = `${number}%`;
 export type WidgetNumber = number;
@@ -21,7 +22,7 @@ export interface ICharacterSpecBase {
 export type IEditorTextGraphicAttribute = {
     graphicAlign?: 'left' | 'center' | 'right';
     graphicBaseline?: 'top' | 'middle' | 'bottom';
-} & ITextGraphicAttribute;
+} & Partial<ITextGraphicAttribute & IRichTextGraphicAttribute>;
 export interface IComponentCharacterSpec extends ICharacterSpecBase {
     options: {
         graphic: any;
@@ -44,6 +45,7 @@ export interface IComponentSpec {
 export interface IChartCharacterSpec extends ICharacterSpecBase {
     options: {
         spec?: any;
+        initOption?: IInitOption;
         panel?: any;
         theme?: any;
         data?: any;

package/cjs/story/character/dsl-interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/dsl-interface.ts"],"names":[],"mappings":"","file":"dsl-interface.js","sourcesContent":["import type { ITextGraphicAttribute } from '@visactor/vrender';\nimport type { DirectionType } from './chart/const';\n\nexport type IPercent = `${number}%`;\nexport type WidgetNumber = number; // | IPercent;\n\nexport type IWidgetData = {\n  left: WidgetNumber;\n  top: WidgetNumber;\n} & (\n  | {\n      bottom: WidgetNumber;\n      right: WidgetNumber;\n    }\n  | {\n      width: WidgetNumber;\n      height: WidgetNumber;\n    }\n);\n\nexport interface ICharacterSpecBase {\n  id: string;\n  type: string; // 类型\n  position: IWidgetData; // 定位描述\n  zIndex: number;\n}\n\nexport type IEditorTextGraphicAttribute = {\n  graphicAlign?: 'left' | 'center' | 'right';\n  graphicBaseline?: 'top' | 'middle' | 'bottom';\n} & ITextGraphicAttribute;\n\nexport interface IComponentCharacterSpec extends ICharacterSpecBase {\n  options: {\n    graphic: any;\n    text?: IEditorTextGraphicAttribute;\n    isResized?: boolean;\n    angle?: number;\n    shapePoints?: any;\n  };\n}\n\nexport interface IComponentMatch {\n  usrId?: string;\n  specIndex?: number | 'all'; // all 表示所有\n  [key: string]: any;\n}\n\nexport interface IComponentSpec {\n  specKey: string;\n  matchInfo: IComponentMatch;\n  spec: any;\n}\n\nexport interface IChartCharacterSpec extends ICharacterSpecBase {\n  options: {\n    // 图表spec\n    spec?: any;\n    panel?: any;\n    // 各种图表配置属性\n    theme?: any;\n    // 数据源\n    data?: any;\n    // 内部模块布局信息\n    padding?: any;\n    // 标题\n    title?: any;\n    layout?: any;\n    // 色板\n    color?: string[];\n    // 标注\n    marker?: any;\n    // mark单元素样式配置\n    markStyle?: any[];\n    // 组样式\n    dataGroupSpec?: {\n      [key: string]: any;\n    };\n    // 方向\n    direction?: DirectionType;\n    // 系列配置\n    seriesSpec?: {\n      matchInfo: IComponentMatch;\n      spec: any;\n    }[];\n    // 模块 spec\n    componentSpec?: IComponentSpec[];\n  };\n}\n\nexport type ICharacterSpec = IChartCharacterSpec | IComponentCharacterSpec;\n"]}
+{"version":3,"sources":["../src/story/character/dsl-interface.ts"],"names":[],"mappings":"","file":"dsl-interface.js","sourcesContent":["import type { IInitOption } from '@visactor/vchart';\nimport type { IRichTextGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender';\nimport type { DirectionType } from './chart/const';\n\nexport type IPercent = `${number}%`;\nexport type WidgetNumber = number; // | IPercent;\n\nexport type IWidgetData = {\n  left: WidgetNumber;\n  top: WidgetNumber;\n} & (\n  | {\n      bottom: WidgetNumber;\n      right: WidgetNumber;\n    }\n  | {\n      width: WidgetNumber;\n      height: WidgetNumber;\n    }\n);\n\nexport interface ICharacterSpecBase {\n  id: string;\n  type: string; // 类型\n  position: IWidgetData; // 定位描述\n  zIndex: number;\n}\n\nexport type IEditorTextGraphicAttribute = {\n  graphicAlign?: 'left' | 'center' | 'right';\n  graphicBaseline?: 'top' | 'middle' | 'bottom';\n} & Partial<ITextGraphicAttribute & IRichTextGraphicAttribute>;\n\nexport interface IComponentCharacterSpec extends ICharacterSpecBase {\n  options: {\n    graphic: any;\n    text?: IEditorTextGraphicAttribute;\n    isResized?: boolean;\n    angle?: number;\n    shapePoints?: any;\n  };\n}\n\nexport interface IComponentMatch {\n  usrId?: string;\n  specIndex?: number | 'all'; // all 表示所有\n  [key: string]: any;\n}\n\nexport interface IComponentSpec {\n  specKey: string;\n  matchInfo: IComponentMatch;\n  spec: any;\n}\n\nexport interface IChartCharacterSpec extends ICharacterSpecBase {\n  options: {\n    // 图表spec\n    spec?: any;\n    // 初始化参数\n    initOption?: IInitOption;\n    panel?: any;\n    // 各种图表配置属性\n    theme?: any;\n    // 数据源\n    data?: any;\n    // 内部模块布局信息\n    padding?: any;\n    // 标题\n    title?: any;\n    layout?: any;\n    // 色板\n    color?: string[];\n    // 标注\n    marker?: any;\n    // mark单元素样式配置\n    markStyle?: any[];\n    // 组样式\n    dataGroupSpec?: {\n      [key: string]: any;\n    };\n    // 方向\n    direction?: DirectionType;\n    // 系列配置\n    seriesSpec?: {\n      matchInfo: IComponentMatch;\n      spec: any;\n    }[];\n    // 模块 spec\n    componentSpec?: IComponentSpec[];\n  };\n}\n\nexport type ICharacterSpec = IChartCharacterSpec | IComponentCharacterSpec;\n"]}

package/cjs/story/character/runtime-interface.d.ts

@@ -1,25 +1,31 @@
-import type { IGroup } from '@visactor/vrender';
-import type { IPointLike } from '@visactor/vutils';
+import type { IGroup, IGraphic } from '@visactor/vrender';
+import type { IBoundsLike, IPointLike } from '@visactor/vutils';
 import type { IStory, IStoryCanvas, StoryEvent } from '../interface/runtime-interface';
 import type { ICharacterSpec } from './dsl-interface';
 import type { Graphic } from './component/graphic/graphic';
 export interface ICharacterPickInfo {
     part: string;
-    graphicType: string;
+    graphic?: IGraphic;
+    graphicType?: string;
+    modelInfo?: any;
 }
 export interface ICharacter {
     id: string;
+    type: string;
+    visActorType: string;
     spec: ICharacterSpec;
+    graphic: Graphic | IGroup;
     init: () => void;
     reset: () => void;
     show: () => void;
     hide: () => void;
     getGraphicParent: () => IGroup;
-    graphic: Graphic | IGroup;
+    getLayoutBounds: () => IBoundsLike;
     tickTo: (t: number) => void;
     checkEvent: (event: StoryEvent) => false | (ICharacterPickInfo & any);
     updateSpec: (spec: Omit<Partial<ICharacterSpec>, 'id' | 'type'>) => void;
     setAttributes: (attr: Record<string, any>) => void;
+    release: () => void;
 }
 export interface ICharacterInitOption {
     story: IStory;

package/cjs/story/character/runtime-interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/runtime-interface.ts"],"names":[],"mappings":"","file":"runtime-interface.js","sourcesContent":["import type { IGroup } from '@visactor/vrender';\nimport type { IPointLike } from '@visactor/vutils';\nimport type { StoryCanvas } from '../canvas/canvas';\nimport type { IStory, IStoryCanvas, StoryEvent } from '../interface/runtime-interface';\nimport type { ICharacterSpec } from './dsl-interface';\nimport type { Graphic } from './component/graphic/graphic';\n\nexport interface ICharacterPickInfo {\n  part: string;\n  graphicType: string;\n}\nexport interface ICharacter {\n  id: string;\n  spec: ICharacterSpec;\n\n  init: () => void;\n  reset: () => void;\n  show: () => void;\n  hide: () => void;\n  getGraphicParent: () => IGroup;\n  graphic: Graphic | IGroup;\n  tickTo: (t: number) => void;\n\n  checkEvent: (event: StoryEvent) => false | (ICharacterPickInfo & any);\n\n  updateSpec: (spec: Omit<Partial<ICharacterSpec>, 'id' | 'type'>) => void;\n\n  setAttributes: (attr: Record<string, any>) => void;\n}\n\nexport interface ICharacterInitOption {\n  story: IStory;\n  canvas: IStoryCanvas;\n  graphicParent: IGroup;\n}\n\nexport interface ICharacterConstructor {\n  new (spec: ICharacterSpec, option: ICharacterInitOption): ICharacter;\n}\n\nexport interface ILayoutAttribute {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  angle: number;\n  anchor?: [number | string, number | string];\n  dx?: number;\n  dy?: number;\n  shapePoints?: IPointLike[];\n}\n"]}
+{"version":3,"sources":["../src/story/character/runtime-interface.ts"],"names":[],"mappings":"","file":"runtime-interface.js","sourcesContent":["import type { IGroup, IGraphic } from '@visactor/vrender';\nimport type { IBoundsLike, IPointLike } from '@visactor/vutils';\nimport type { IStory, IStoryCanvas, StoryEvent } from '../interface/runtime-interface';\nimport type { ICharacterSpec } from './dsl-interface';\nimport type { Graphic } from './component/graphic/graphic';\n\nexport interface ICharacterPickInfo {\n  part: string;\n  graphic?: IGraphic;\n  graphicType?: string;\n  modelInfo?: any;\n}\nexport interface ICharacter {\n  id: string;\n  type: string;\n  visActorType: string;\n  spec: ICharacterSpec;\n  graphic: Graphic | IGroup;\n\n  init: () => void;\n  reset: () => void;\n  show: () => void;\n  hide: () => void;\n  getGraphicParent: () => IGroup;\n  getLayoutBounds: () => IBoundsLike;\n  tickTo: (t: number) => void;\n\n  checkEvent: (event: StoryEvent) => false | (ICharacterPickInfo & any);\n\n  updateSpec: (spec: Omit<Partial<ICharacterSpec>, 'id' | 'type'>) => void;\n\n  setAttributes: (attr: Record<string, any>) => void;\n  release: () => void;\n}\n\nexport interface ICharacterInitOption {\n  story: IStory;\n  canvas: IStoryCanvas;\n  graphicParent: IGroup;\n}\n\nexport interface ICharacterConstructor {\n  new (spec: ICharacterSpec, option: ICharacterInitOption): ICharacter;\n}\n\nexport interface ILayoutAttribute {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  angle: number;\n  anchor?: [number | string, number | string];\n  dx?: number;\n  dy?: number;\n  shapePoints?: IPointLike[];\n}\n"]}

package/cjs/story/character/visactor/character.d.ts

@@ -1,15 +1,14 @@
-import { ICharacterSpec } from 'src/story/character/dsl-interface';
+import type { ICharacterSpec } from 'src/story/character/dsl-interface';
 import { CharacterBase } from '../base/base';
-import type { ISpecProcess, ICharacterVisactor, IVisactorGraphic } from './interface';
-import { ICharacterInitOption } from '../runtime-interface';
-import { IChartCharacterRuntime } from '../chart/runtime/interface';
+import type { ISpecProcess, ICharacterVisactor } from './interface';
+import type { ICharacterInitOption } from '../runtime-interface';
+import type { IChartCharacterRuntime } from '../chart/runtime/interface';
 export declare abstract class CharacterVisactor extends CharacterBase implements ICharacterVisactor {
     protected _specProcess: ISpecProcess;
     get specProcess(): ISpecProcess;
     get dataTempTransform(): import("./interface").IDataTempTransform;
     get chartType(): string;
     get tempType(): string;
-    protected _graphic: IVisactorGraphic;
     protected _runtime: IChartCharacterRuntime[];
     constructor(spec: ICharacterSpec, option: ICharacterInitOption);
     protected _initRuntime(): void;
@@ -24,7 +23,22 @@ export declare abstract class CharacterVisactor extends CharacterBase implements
     protected abstract _updateVisactorSpec(): void;
     show(): void;
     hide(): void;
-    getGraphicParent(): IVisactorGraphic;
+    getGraphicParent(): any;
+    getViewBoxFromSpec(): {
+        layout: Partial<import("../runtime-interface").ILayoutAttribute>;
+        viewBox: {
+            x1: number;
+            x2: number;
+            y1: number;
+            y2: number;
+        };
+    };
+    getLayoutBounds(): {
+        x1: number;
+        x2: number;
+        y1: number;
+        y2: number;
+    };
     tickTo(t: number): void;
     release(): void;
 }

package/cjs/story/character/visactor/character.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CharacterVisactor = void 0;
 
-const base_1 = require("../base/base");
+const base_1 = require("../base/base"), layout_1 = require("../../utils/layout");
 
 class CharacterVisactor extends base_1.CharacterBase {
     get specProcess() {
@@ -43,6 +43,22 @@ class CharacterVisactor extends base_1.CharacterBase {
     getGraphicParent() {
         return this._graphic;
     }
+    getViewBoxFromSpec() {
+        const layout = (0, layout_1.getLayoutFromWidget)(this._spec.position);
+        return {
+            layout: layout,
+            viewBox: {
+                x1: layout.x,
+                x2: layout.x + layout.width,
+                y1: layout.y,
+                y2: layout.y + layout.height
+            }
+        };
+    }
+    getLayoutBounds() {
+        const {viewBox: viewBox} = this.getViewBoxFromSpec();
+        return viewBox;
+    }
     tickTo(t) {}
     release() {
         var _a, _b;

package/cjs/story/character/visactor/character.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/visactor/character.ts"],"names":[],"mappings":";;;AAEA,uCAA6C;AAK7C,MAAsB,iBAAkB,SAAQ,oBAAa;IAE3D,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,MAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,0CAAE,YAAY,EAAE,CAAC;IACtE,CAAC;IAED,IAAI,QAAQ;;QACV,OAAO,MAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,0CAAE,IAAI,CAAC;IAC5D,CAAC;IAMD,YAAY,IAAoB,EAAE,MAA4B;QAC5D,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAHZ,aAAQ,GAA6B,EAAE,CAAC;QAelD,gBAAW,GAAG,GAAG,EAAE;;YACjB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,WAAW,iDAAI,CAAA,EAAA,CAAC,CAAC;YAC9C,MAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,0CAAE,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpH,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC,CAAC;QAjBA,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAES,YAAY,KAAU,CAAC;IAEjC,WAAW,CAAC,GAAqD;IAEjE,CAAC;IAgBD,IAAI;QACF,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IACD,IAAI;QACF,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,CAAS;QACd,OAAO;IACT,CAAC;IAED,OAAO;;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC3C,CAAC;CACF;AAlED,8CAkEC","file":"character.js","sourcesContent":["/* eslint-disable no-console */\nimport { ICharacterSpec } from 'src/story/character/dsl-interface';\nimport { CharacterBase } from '../base/base';\nimport type { ISpecProcess, ICharacterVisactor, IVisactorGraphic } from './interface';\nimport { ICharacterInitOption } from '../runtime-interface';\nimport { IChartCharacterRuntime } from '../chart/runtime/interface';\n\nexport abstract class CharacterVisactor extends CharacterBase implements ICharacterVisactor {\n  protected declare _specProcess: ISpecProcess;\n  get specProcess() {\n    return this._specProcess;\n  }\n  get dataTempTransform() {\n    return this._specProcess.dataTempTransform;\n  }\n\n  get chartType() {\n    return this._specProcess.dataTempTransform.specTemp?.getChartType();\n  }\n\n  get tempType() {\n    return this._specProcess.dataTempTransform.specTemp?.type;\n  }\n\n  protected declare _graphic: IVisactorGraphic;\n\n  protected _runtime: IChartCharacterRuntime[] = [];\n\n  constructor(spec: ICharacterSpec, option: ICharacterInitOption) {\n    super(spec, option);\n    this._initSpecProcess();\n  }\n\n  protected _initRuntime(): void {}\n\n  clearConfig(opt: { clearCurrent: false | { [key: string]: any } }) {\n    // do nothing\n  }\n\n  protected abstract _initSpecProcess(): void;\n\n  onSpecReady = () => {\n    console.log('onSpecReady !');\n    this._runtime.forEach(r => r.onSpecReady?.());\n    this._specProcess.dataTempTransform.specTemp?.standardizedSpec(this._specProcess.getVisSpec(), { character: this });\n    this._updateVisactorSpec();\n    this._afterRender();\n  };\n\n  protected abstract _afterRender(): void;\n\n  protected abstract _updateVisactorSpec(): void;\n\n  show(): void {\n    this._graphic.setAttribute('visibleAll', true);\n  }\n  hide(): void {\n    this._graphic.setAttribute('visibleAll', false);\n  }\n\n  getGraphicParent() {\n    return this._graphic;\n  }\n\n  tickTo(t: number): void {\n    return;\n  }\n\n  release() {\n    this._specProcess.release();\n    this._graphic?.parent?.removeChild(this._graphic);\n    this._specProcess = this._graphic = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character/visactor/character.ts"],"names":[],"mappings":";;;AAEA,uCAA6C;AAI7C,+CAAyD;AAEzD,MAAsB,iBAAkB,SAAQ,oBAAa;IAE3D,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,MAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,0CAAE,YAAY,EAAE,CAAC;IACtE,CAAC;IAED,IAAI,QAAQ;;QACV,OAAO,MAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,0CAAE,IAAI,CAAC;IAC5D,CAAC;IAID,YAAY,IAAoB,EAAE,MAA4B;QAC5D,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAHZ,aAAQ,GAA6B,EAAE,CAAC;QAiBlD,gBAAW,GAAG,GAAG,EAAE;;YACjB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,WAAW,iDAAI,CAAA,EAAA,CAAC,CAAC;YAC9C,MAAA,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,0CAAE,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpH,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC,CAAC;QAnBA,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAES,YAAY;QACpB,OAAO;IACT,CAAC;IAED,WAAW,CAAC,GAAqD;IAEjE,CAAC;IAgBD,IAAI;QACF,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IACD,IAAI;QACF,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,kBAAkB;QAChB,MAAM,MAAM,GAAG,IAAA,4BAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG;YACd,EAAE,EAAE,MAAM,CAAC,CAAC;YACZ,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK;YAC3B,EAAE,EAAE,MAAM,CAAC,CAAC;YACZ,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM;SAC7B,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,eAAe;QACb,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9C,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,CAAS;QACd,OAAO;IACT,CAAC;IAED,OAAO;;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC3C,CAAC;CACF;AAlFD,8CAkFC","file":"character.js","sourcesContent":["/* eslint-disable no-console */\nimport type { ICharacterSpec } from 'src/story/character/dsl-interface';\nimport { CharacterBase } from '../base/base';\nimport type { ISpecProcess, ICharacterVisactor } from './interface';\nimport type { ICharacterInitOption } from '../runtime-interface';\nimport type { IChartCharacterRuntime } from '../chart/runtime/interface';\nimport { getLayoutFromWidget } from '../../utils/layout';\n\nexport abstract class CharacterVisactor extends CharacterBase implements ICharacterVisactor {\n  protected declare _specProcess: ISpecProcess;\n  get specProcess() {\n    return this._specProcess;\n  }\n  get dataTempTransform() {\n    return this._specProcess.dataTempTransform;\n  }\n\n  get chartType() {\n    return this._specProcess.dataTempTransform.specTemp?.getChartType();\n  }\n\n  get tempType() {\n    return this._specProcess.dataTempTransform.specTemp?.type;\n  }\n\n  protected _runtime: IChartCharacterRuntime[] = [];\n\n  constructor(spec: ICharacterSpec, option: ICharacterInitOption) {\n    super(spec, option);\n    this._initSpecProcess();\n  }\n\n  protected _initRuntime(): void {\n    return;\n  }\n\n  clearConfig(opt: { clearCurrent: false | { [key: string]: any } }) {\n    // do nothing\n  }\n\n  protected abstract _initSpecProcess(): void;\n\n  onSpecReady = () => {\n    console.log('onSpecReady !');\n    this._runtime.forEach(r => r.onSpecReady?.());\n    this._specProcess.dataTempTransform.specTemp?.standardizedSpec(this._specProcess.getVisSpec(), { character: this });\n    this._updateVisactorSpec();\n    this._afterRender();\n  };\n\n  protected abstract _afterRender(): void;\n\n  protected abstract _updateVisactorSpec(): void;\n\n  show(): void {\n    this._graphic.setAttribute('visibleAll', true);\n  }\n  hide(): void {\n    this._graphic.setAttribute('visibleAll', false);\n  }\n\n  getGraphicParent() {\n    return this._graphic;\n  }\n\n  getViewBoxFromSpec() {\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    return { layout, viewBox };\n  }\n\n  getLayoutBounds() {\n    const { viewBox } = this.getViewBoxFromSpec();\n    return viewBox;\n  }\n\n  tickTo(t: number): void {\n    return;\n  }\n\n  release() {\n    this._specProcess.release();\n    this._graphic?.parent?.removeChild(this._graphic);\n    this._specProcess = this._graphic = null;\n  }\n}\n"]}

package/cjs/story/character/visactor/interface.d.ts

@@ -84,6 +84,7 @@ export interface IVisactorTempConstructor {
 export interface IVisactorGraphic extends IGroup {
     readonly vProduct: IVChart;
     updateSpec: (spec: any) => void;
+    release: () => void;
 }
 export interface ICharacterVisactor extends ICharacter {
     clearConfig: (opt: {

package/cjs/story/character/visactor/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character/visactor/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IChartCharacterSpec } from '../dsl-interface';\nimport type { EventEmitter } from '@visactor/vutils';\nimport type { ICharacter } from '../runtime-interface';\nimport type { ISpec, IVChart } from '@visactor/vchart';\nimport type { IGroup } from '@visactor/vrender';\n\nexport type StandardData = IDataValue | IDataValue[];\nexport type IParserValue = any;\nexport type DataUpdateCall = (data: StandardData) => void;\nexport type DataErrorCall = (msg: { type: string; info: string }, opt?: any) => void;\n\n// visactor 元素的内部结构\n// 数据部分 start\n// DataParser：数据处理。负责解析数据，得到模版可用数据，处理数据上的特性内容。\n// VisactorTemp：模版处理。负责结合数据，生成对应类型的基础 spec。不同类型图表的特殊逻辑，在 temp 中处理\n// DataTempTransform：数据与模版更新管理，当数据/模版更新时，通过这个模块判定更新是否成功，成功后抛出更新成功消息。包含 VisactorTemp 与 DataParser\n// SpecProcess：编辑配置管理器，编辑属性更新的处理，对外输出合并了编辑信息的 spec 。包含一个 dataTempTransform\n// 数据部分 end\n\n// graphic 部分 start\n// IVisactorGraphic：包含一个 vchart｜vtbale 。visactor 的自定义图元封装。处理图元是否重绘，viewBox的图元属性逻辑\n// IVisactorGraphic-render：实际的 draw 入口，处理绘图过程，主要是处理变换矩阵。\n// graphic 部分 end\n\n// Visactor-role：编辑元素，包含一个 specProcess、IVisactorGraphic\n\nexport interface IDataTempTransform {\n  readonly specTemp: IVisactorTemp;\n\n  readonly nextTemp: IVisactorTemp;\n  emitter: EventEmitter;\n\n  updateChartTemp: (temp?: string) => void;\n\n  // 得到没有经过编辑器配置加工过的基础spec\n  getBaseSpec: () => any;\n\n  // 释放\n  release: () => void;\n\n  dataParser?: IDataParser;\n}\n\nexport interface IDataTempTransformConstructor {\n  new ({ specProcess, character }: { character: ICharacterVisactor; specProcess: ISpecProcess }): IDataTempTransform;\n}\n\nexport interface ISpecProcess {\n  dataTempTransform: IDataTempTransform;\n  emitter: EventEmitter;\n\n  // 得到visactor元素的spec\n  getVisSpec: () => ISpec;\n  // 得到角色的spec\n  getCharacterSpec: () => IChartCharacterSpec;\n\n  // temp\n  getCharacterType: () => string;\n\n  release: () => void;\n}\n\nexport type IDataType = any;\n\nexport interface IDataValue {\n  id: string;\n  sourceKey: string;\n  values: IDataType[];\n}\n\nexport type DataInfo = {\n  [key: string]: {\n    type: 'ordinal' | 'linear';\n  };\n};\n\nexport type DataSave = {\n  type: string;\n  value: any;\n};\n\nexport interface IDataParser {\n  type: string;\n  getData: () => StandardData;\n  getDataValue: () => IParserValue;\n  getDataInfo?: () => DataInfo;\n  getSpecOption?: () => any;\n  getSave: () => DataSave;\n  updateValue: (value: IParserValue) => void;\n  setDataUpdateHandler: (call: DataUpdateCall) => void;\n  setDataErrorHandler: (call: DataErrorCall) => void;\n  clear: () => void;\n}\n\nexport interface IDataParserConstructor {\n  type: string;\n  new (\n    value: any,\n    option: {\n      updateCall: DataUpdateCall;\n      errorCall: DataErrorCall;\n      currentData?: IDataParser;\n      emitter: EventEmitter;\n    }\n  ): IDataParser;\n}\n\n// chart & table 都是用这个模版接口\nexport interface IVisactorTemp {\n  type: string;\n  getSpec: (data: StandardData, ctx: any, opt?: any) => ISpec | null;\n  standardizedSpec: (spec: any, ctx: any, opt?: any) => void;\n  getChartType: () => string;\n  checkDataEnable: (data: StandardData, opt?: any) => boolean;\n  getTempInfo?: () => any;\n  clear: () => void;\n}\n\nexport interface IVisactorTempConstructor {\n  new (): IVisactorTemp;\n}\n\n// 绘图元素\nexport interface IVisactorGraphic extends IGroup {\n  readonly vProduct: IVChart;\n\n  updateSpec: (spec: any) => void;\n}\n\n// 编辑元素\nexport interface ICharacterVisactor extends ICharacter {\n  // 清除编辑数据\n  clearConfig: (opt: { clearCurrent: false | { [key: string]: any } }) => void;\n  getGraphicParent: () => IVisactorGraphic;\n}\n\nexport interface IUpdateAttributeOption {\n  triggerHistory?: boolean;\n  saveData?: boolean;\n  actionType?: 'data-add' | 'data-change' | 'data-replace' | string;\n}\n"]}
+{"version":3,"sources":["../src/story/character/visactor/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IChartCharacterSpec } from '../dsl-interface';\nimport type { EventEmitter, IBoundsLike } from '@visactor/vutils';\nimport type { ICharacter } from '../runtime-interface';\nimport type { ISpec, IVChart } from '@visactor/vchart';\nimport type { IGroup } from '@visactor/vrender';\n\nexport type StandardData = IDataValue | IDataValue[];\nexport type IParserValue = any;\nexport type DataUpdateCall = (data: StandardData) => void;\nexport type DataErrorCall = (msg: { type: string; info: string }, opt?: any) => void;\n\n// visactor 元素的内部结构\n// 数据部分 start\n// DataParser：数据处理。负责解析数据，得到模版可用数据，处理数据上的特性内容。\n// VisactorTemp：模版处理。负责结合数据，生成对应类型的基础 spec。不同类型图表的特殊逻辑，在 temp 中处理\n// DataTempTransform：数据与模版更新管理，当数据/模版更新时，通过这个模块判定更新是否成功，成功后抛出更新成功消息。包含 VisactorTemp 与 DataParser\n// SpecProcess：编辑配置管理器，编辑属性更新的处理，对外输出合并了编辑信息的 spec 。包含一个 dataTempTransform\n// 数据部分 end\n\n// graphic 部分 start\n// IVisactorGraphic：包含一个 vchart｜vtbale 。visactor 的自定义图元封装。处理图元是否重绘，viewBox的图元属性逻辑\n// IVisactorGraphic-render：实际的 draw 入口，处理绘图过程，主要是处理变换矩阵。\n// graphic 部分 end\n\n// Visactor-role：编辑元素，包含一个 specProcess、IVisactorGraphic\n\nexport interface IDataTempTransform {\n  readonly specTemp: IVisactorTemp;\n\n  readonly nextTemp: IVisactorTemp;\n  emitter: EventEmitter;\n\n  updateChartTemp: (temp?: string) => void;\n\n  // 得到没有经过编辑器配置加工过的基础spec\n  getBaseSpec: () => any;\n\n  // 释放\n  release: () => void;\n\n  dataParser?: IDataParser;\n}\n\nexport interface IDataTempTransformConstructor {\n  new ({ specProcess, character }: { character: ICharacterVisactor; specProcess: ISpecProcess }): IDataTempTransform;\n}\n\nexport interface ISpecProcess {\n  dataTempTransform: IDataTempTransform;\n  emitter: EventEmitter;\n\n  // 得到visactor元素的spec\n  getVisSpec: () => ISpec;\n  // 得到角色的spec\n  getCharacterSpec: () => IChartCharacterSpec;\n\n  // temp\n  getCharacterType: () => string;\n\n  release: () => void;\n}\n\nexport type IDataType = any;\n\nexport interface IDataValue {\n  id: string;\n  sourceKey: string;\n  values: IDataType[];\n}\n\nexport type DataInfo = {\n  [key: string]: {\n    type: 'ordinal' | 'linear';\n  };\n};\n\nexport type DataSave = {\n  type: string;\n  value: any;\n};\n\nexport interface IDataParser {\n  type: string;\n  getData: () => StandardData;\n  getDataValue: () => IParserValue;\n  getDataInfo?: () => DataInfo;\n  getSpecOption?: () => any;\n  getSave: () => DataSave;\n  updateValue: (value: IParserValue) => void;\n  setDataUpdateHandler: (call: DataUpdateCall) => void;\n  setDataErrorHandler: (call: DataErrorCall) => void;\n  clear: () => void;\n}\n\nexport interface IDataParserConstructor {\n  type: string;\n  new (\n    value: any,\n    option: {\n      updateCall: DataUpdateCall;\n      errorCall: DataErrorCall;\n      currentData?: IDataParser;\n      emitter: EventEmitter;\n    }\n  ): IDataParser;\n}\n\n// chart & table 都是用这个模版接口\nexport interface IVisactorTemp {\n  type: string;\n  getSpec: (data: StandardData, ctx: any, opt?: any) => ISpec | null;\n  standardizedSpec: (spec: any, ctx: any, opt?: any) => void;\n  getChartType: () => string;\n  checkDataEnable: (data: StandardData, opt?: any) => boolean;\n  getTempInfo?: () => any;\n  clear: () => void;\n}\n\nexport interface IVisactorTempConstructor {\n  new (): IVisactorTemp;\n}\n\n// 绘图元素\nexport interface IVisactorGraphic extends IGroup {\n  readonly vProduct: IVChart;\n\n  updateSpec: (spec: any) => void;\n  release: () => void;\n}\n\n// 编辑元素\nexport interface ICharacterVisactor extends ICharacter {\n  // 清除编辑数据\n  clearConfig: (opt: { clearCurrent: false | { [key: string]: any } }) => void;\n  getGraphicParent: () => IVisactorGraphic;\n}\n\nexport interface IUpdateAttributeOption {\n  triggerHistory?: boolean;\n  saveData?: boolean;\n  actionType?: 'data-add' | 'data-change' | 'data-replace' | string;\n}\n"]}

package/cjs/story/character-tree/character-tree.d.ts

@@ -12,4 +12,5 @@ export declare class CharacterTree implements ICharacterTree {
     getCharactersById(key: string): ICharacter;
     addCharacter(spec: ICharacterSpec): ICharacter;
     initCharacters(specs: ICharacterSpec[]): void;
+    releaseOldCharacters(): void;
 }

package/cjs/story/character-tree/character-tree.js

@@ -26,6 +26,7 @@ class CharacterTree {
         this._characters[spec.id]) : null;
     }
     initCharacters(specs) {
+        this.releaseOldCharacters(), this._characters = {};
         const option = {
             story: this._story,
             canvas: this._story.canvas,
@@ -35,6 +36,11 @@ class CharacterTree {
             spec.id && (this._characters[spec.id] || (this._characters[spec.id] = factory_1.StoryFactory.createCharacter(spec, option)));
         }));
     }
+    releaseOldCharacters() {
+        Object.keys(this._characters).forEach((k => {
+            this._characters[k].release();
+        }));
+    }
 }
 
 exports.CharacterTree = CharacterTree;

package/cjs/story/character-tree/character-tree.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/story/character-tree/character-tree.ts"],"names":[],"mappings":";;;AACA,gDAAkD;AAGlD,MAAa,aAAa;IAIxB,YAAY,KAAa;QAHf,gBAAW,GAAkC,EAAE,CAAC;QAIxD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,iBAAiB,CAAC,GAAW;QAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IACvC,CAAC;IAED,YAAY,CAAC,IAAoB;QAC/B,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,YAAY;SAC1D,CAAC;QACF,IAAqB,IAAK,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,EAAE;gBAChD,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,GAAG,sBAAY,CAAC,eAAe,CAAiB,IAAI,EAAE,MAAM,CAAC,CAAC;aAC1G;YACD,OAAO,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,CAAC;SACpD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,KAAuB;QACpC,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,YAAY;SAC1D,CAAC;QAEF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,IAAqB,IAAK,CAAC,EAAE,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,EAAE;oBAChD,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,GAAG,sBAAY,CAAC,eAAe,CAAiB,IAAI,EAAE,MAAM,CAAC,CAAC;iBAC1G;aAEF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA/CD,sCA+CC","file":"character-tree.js","sourcesContent":["import type { ICharacter, ICharacterSpec } from '../character';\nimport { StoryFactory } from '../factory/factory';\nimport type { ICharacterTree, IStory } from '../interface';\n\nexport class CharacterTree implements ICharacterTree {\n  protected _characters: { [key: string]: ICharacter } = {};\n  protected _story: IStory;\n\n  constructor(story: IStory) {\n    this._story = story;\n  }\n\n  getCharacters(): { [key: string]: ICharacter } {\n    return this._characters;\n  }\n\n  getCharactersById(key: string) {\n    return this._characters[key] || null;\n  }\n\n  addCharacter(spec: ICharacterSpec) {\n    const option = {\n      story: this._story,\n      canvas: this._story.canvas,\n      graphicParent: this._story.canvas.getStage().defaultLayer\n    };\n    if ((<ICharacterSpec>spec).id) {\n      if (!this._characters[(<ICharacterSpec>spec).id]) {\n        this._characters[(<ICharacterSpec>spec).id] = StoryFactory.createCharacter(<ICharacterSpec>spec, option);\n      }\n      return this._characters[(<ICharacterSpec>spec).id];\n    }\n    return null;\n  }\n\n  initCharacters(specs: ICharacterSpec[]): void {\n    const option = {\n      story: this._story,\n      canvas: this._story.canvas,\n      graphicParent: this._story.canvas.getStage().defaultLayer\n    };\n\n    specs.forEach(spec => {\n      if ((<ICharacterSpec>spec).id) {\n        if (!this._characters[(<ICharacterSpec>spec).id]) {\n          this._characters[(<ICharacterSpec>spec).id] = StoryFactory.createCharacter(<ICharacterSpec>spec, option);\n        }\n        // return this._characters[(<ICharacterSpec>spec).id];\n      }\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/story/character-tree/character-tree.ts"],"names":[],"mappings":";;;AACA,gDAAkD;AAGlD,MAAa,aAAa;IAIxB,YAAY,KAAa;QAHf,gBAAW,GAAkC,EAAE,CAAC;QAIxD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,iBAAiB,CAAC,GAAW;QAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IACvC,CAAC;IAED,YAAY,CAAC,IAAoB;QAC/B,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,YAAY;SAC1D,CAAC;QACF,IAAqB,IAAK,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,EAAE;gBAChD,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,GAAG,sBAAY,CAAC,eAAe,CAAiB,IAAI,EAAE,MAAM,CAAC,CAAC;aAC1G;YACD,OAAO,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,CAAC;SACpD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,KAAuB;QACpC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,YAAY;SAC1D,CAAC;QAEF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,IAAqB,IAAK,CAAC,EAAE,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,EAAE;oBAChD,IAAI,CAAC,WAAW,CAAkB,IAAK,CAAC,EAAE,CAAC,GAAG,sBAAY,CAAC,eAAe,CAAiB,IAAI,EAAE,MAAM,CAAC,CAAC;iBAC1G;aAEF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB;QAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACxC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC,CAAC,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxDD,sCAwDC","file":"character-tree.js","sourcesContent":["import type { ICharacter, ICharacterSpec } from '../character';\nimport { StoryFactory } from '../factory/factory';\nimport type { ICharacterTree, IStory } from '../interface';\n\nexport class CharacterTree implements ICharacterTree {\n  protected _characters: { [key: string]: ICharacter } = {};\n  protected _story: IStory;\n\n  constructor(story: IStory) {\n    this._story = story;\n  }\n\n  getCharacters(): { [key: string]: ICharacter } {\n    return this._characters;\n  }\n\n  getCharactersById(key: string) {\n    return this._characters[key] || null;\n  }\n\n  addCharacter(spec: ICharacterSpec) {\n    const option = {\n      story: this._story,\n      canvas: this._story.canvas,\n      graphicParent: this._story.canvas.getStage().defaultLayer\n    };\n    if ((<ICharacterSpec>spec).id) {\n      if (!this._characters[(<ICharacterSpec>spec).id]) {\n        this._characters[(<ICharacterSpec>spec).id] = StoryFactory.createCharacter(<ICharacterSpec>spec, option);\n      }\n      return this._characters[(<ICharacterSpec>spec).id];\n    }\n    return null;\n  }\n\n  initCharacters(specs: ICharacterSpec[]): void {\n    this.releaseOldCharacters();\n    this._characters = {};\n    const option = {\n      story: this._story,\n      canvas: this._story.canvas,\n      graphicParent: this._story.canvas.getStage().defaultLayer\n    };\n\n    specs.forEach(spec => {\n      if ((<ICharacterSpec>spec).id) {\n        if (!this._characters[(<ICharacterSpec>spec).id]) {\n          this._characters[(<ICharacterSpec>spec).id] = StoryFactory.createCharacter(<ICharacterSpec>spec, option);\n        }\n        // return this._characters[(<ICharacterSpec>spec).id];\n      }\n    });\n  }\n\n  releaseOldCharacters() {\n    Object.keys(this._characters).forEach(k => {\n      const c = this._characters[k];\n      c.release();\n    });\n  }\n}\n"]}