@visactor/vrender-components 0.16.17-alpha.4 → 0.16.17

package/es/marker/type.d.ts

@@ -37,16 +37,16 @@ export type IMarkBackgroundAttributes = {
     autoHeight?: boolean;
     autoWidth?: boolean;
 } & Partial<SymbolAttributes>;
-export interface IMarkLabel extends Omit<TagAttributes, 'x' | 'y' | 'panel'> {
+export type IMarkLabel = Omit<TagAttributes, 'x' | 'y' | 'panel'> & {
     panel?: IMarkBackgroundAttributes;
-}
-export interface IMarkRef {
+};
+export type IMarkRef = {
     autoRotate?: boolean;
     refX?: number;
     refY?: number;
     refAngle?: number;
-}
-export interface MarkerAttrs extends IGroupGraphicAttribute {
+};
+export type MarkerAttrs = IGroupGraphicAttribute & {
     type?: 'line' | 'area' | 'point';
     interactive?: boolean;
     visible?: boolean;
@@ -57,16 +57,16 @@ export interface MarkerAttrs extends IGroupGraphicAttribute {
         width: number;
         height: number;
     };
-}
-export interface MarkLineAttrs extends MarkerAttrs, SegmentAttributes {
+};
+export type MarkLineAttrs = MarkerAttrs & SegmentAttributes & {
     type?: 'line';
     points: Point[] | Point[][];
     label?: {
         position?: keyof typeof IMarkLineLabelPosition;
         confine?: boolean;
     } & IMarkRef & IMarkLabel;
-}
-export interface MarkAreaAttrs extends MarkerAttrs {
+};
+export type MarkAreaAttrs = MarkerAttrs & {
     type?: 'area';
     points: Point[];
     label?: {
@@ -74,8 +74,8 @@ export interface MarkAreaAttrs extends MarkerAttrs {
         confine?: boolean;
     } & IMarkLabel;
     areaStyle?: IPolygonAttribute;
-}
-export interface IItemContent extends IMarkRef {
+};
+export type IItemContent = IMarkRef & {
     type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';
     position?: keyof typeof IMarkPointItemPosition;
     offsetX?: number;
@@ -85,7 +85,7 @@ export interface IItemContent extends IMarkRef {
     textStyle?: IMarkLabel;
     richTextStyle?: IRichTextGraphicAttribute;
     renderCustomCallback?: () => IGroup;
-}
+};
 export type IItemLine = {
     type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';
     visible?: boolean;
@@ -94,8 +94,8 @@ export type IItemLine = {
         length?: number;
     };
 } & Omit<SegmentAttributes, 'points'>;
-export interface MarkPointAttrs extends Omit<MarkerAttrs, 'labelStyle'> {
+export type MarkPointAttrs = Omit<MarkerAttrs, 'labelStyle'> & {
     position: Point;
     itemLine?: IItemLine;
     itemContent?: IItemContent;
-}
+};

package/es/marker/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/type.ts"],"names":[],"mappings":"AAYA,MAAM,CAAN,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,qCAAW,CAAA;IACX,2DAAiC,CAAA;IACjC,iEAAuC,CAAA;IACvC,6DAAmC,CAAA;IACnC,mEAAyC,CAAA;IACzC,uDAA6B,CAAA;IAC7B,6DAAmC,CAAA;AACrC,CAAC,EAVW,sBAAsB,KAAtB,sBAAsB,QAUjC;AAED,MAAM,CAAN,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,uCAAa,CAAA;IACb,yCAAe,CAAA;IACf,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,mDAAyB,CAAA;IACzB,qDAA2B,CAAA;IAC3B,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;AAC/B,CAAC,EAVW,sBAAsB,KAAtB,sBAAsB,QAUjC;AAED,MAAM,CAAN,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;IAC7B,uDAA6B,CAAA;AAC/B,CAAC,EAPW,sBAAsB,KAAtB,sBAAsB,QAOjC","file":"type.js","sourcesContent":["import type {\n  IGroup,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  IPolygonAttribute,\n  IRichTextGraphicAttribute,\n  ISymbolGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { SegmentAttributes, SymbolAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\nimport type { Point } from '../core/type';\n\nexport enum IMarkLineLabelPosition {\n  start = 'start',\n  middle = 'middle',\n  end = 'end',\n  insideStartTop = 'insideStartTop',\n  insideStartBottom = 'insideStartBottom',\n  insideMiddleTop = 'insideMiddleTop',\n  insideMiddleBottom = 'insideMiddleBottom',\n  insideEndTop = 'insideEndTop',\n  insideEndBottom = 'insideEndBottom'\n}\n\nexport enum IMarkAreaLabelPosition {\n  left = 'left',\n  right = 'right',\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideLeft = 'insideLeft',\n  insideRight = 'insideRight',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom'\n}\n\nexport enum IMarkPointItemPosition {\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom',\n  insideMiddle = 'insideMiddle'\n}\n\nexport type IMarkBackgroundAttributes = {\n  /**\n   * 是否绘制背景层\n   */\n  visible: boolean;\n  /**\n   * TODO: 根据文字宽度进行背景 panel size自适应\n   */\n  autoHeight?: boolean;\n  /**\n   * TODO: 根据文高度度进行背景 panel size自适应\n   */\n  autoWidth?: boolean;\n} & Partial<SymbolAttributes>;\n\nexport interface IMarkLabel extends Omit<TagAttributes, 'x' | 'y' | 'panel'> {\n  /**\n   * 标签的背景面板配置\n   */\n  panel?: IMarkBackgroundAttributes;\n}\n\nexport interface IMarkRef {\n  /**\n   * 自动旋转，沿着线的方向，默认 true\n   */\n  autoRotate?: boolean;\n  /**\n   * label 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\nexport interface MarkerAttrs extends IGroupGraphicAttribute {\n  type?: 'line' | 'area' | 'point';\n  /**\n   * 是否支持交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * 是否显示marker组件\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 是否将组件在绘制区域内进行剪切\n   * @default true\n   */\n  clipInRange?: boolean;\n  /**\n   * 组件绘制范围配置\n   */\n  limitRect?: {\n    x: number;\n    y: number;\n    width: number;\n    height: number;\n  };\n}\n\nexport interface MarkLineAttrs extends MarkerAttrs, SegmentAttributes {\n  type?: 'line';\n  /**\n   * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n   */\n  points: Point[] | Point[][];\n\n  /**\n   * 标签\n   */\n  label?: {\n    /**\n     * label 相对line的位置\n     */\n    position?: keyof typeof IMarkLineLabelPosition;\n    /**\n     * 当 mark 配置了 clip 之后，label 是否自动调整位置\n     */\n    confine?: boolean;\n  } & IMarkRef &\n    IMarkLabel;\n}\n\nexport interface MarkAreaAttrs extends MarkerAttrs {\n  type?: 'area';\n  /**\n   * 构成area的点\n   */\n  points: Point[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof IMarkAreaLabelPosition;\n    /**\n     * 当 mark 配置了 clip 之后，label 是否自动调整位置\n     */\n    confine?: boolean;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n}\n\nexport interface IItemContent extends IMarkRef {\n  /**\n   * 标注类型\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';\n  position?: keyof typeof IMarkPointItemPosition;\n  /**\n   * x 方向偏移量\n   */\n  offsetX?: number;\n  /**\n   * y 方向偏移量\n   */\n  offsetY?: number;\n  /**\n   * type为symbol时, symbol的样式\n   */\n  symbolStyle?: ISymbolGraphicAttribute;\n  /**\n   * type为image时, image的样式\n   */\n  imageStyle?: IImageGraphicAttribute;\n  /**\n   * type为text时, text的配置\n   */\n  textStyle?: IMarkLabel;\n  /**\n   * type为rich text时, rich text的样式\n   */\n  richTextStyle?: IRichTextGraphicAttribute;\n  /**\n   * type为custom时，允许以callback的方式传入需要render的item\n   */\n  renderCustomCallback?: () => IGroup;\n  // /**\n  //  * 当 mark 配置了 clip 之后，label 是否自动调整位置\n  //  */\n  // confine?: boolean;\n}\n\nexport type IItemLine = {\n  /** TODO：'type-opo' */\n  type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';\n  visible?: boolean;\n  /**\n   * 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n   */\n  decorativeLine?: {\n    visible?: boolean;\n    length?: number;\n  };\n} & Omit<SegmentAttributes, 'points'>;\n\nexport interface MarkPointAttrs extends Omit<MarkerAttrs, 'labelStyle'> {\n  /**\n   * markPoint的位置（也是path的起点）\n   */\n  position: Point;\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n}\n"]}
+{"version":3,"sources":["../src/marker/type.ts"],"names":[],"mappings":"AAYA,MAAM,CAAN,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,qCAAW,CAAA;IACX,2DAAiC,CAAA;IACjC,iEAAuC,CAAA;IACvC,6DAAmC,CAAA;IACnC,mEAAyC,CAAA;IACzC,uDAA6B,CAAA;IAC7B,6DAAmC,CAAA;AACrC,CAAC,EAVW,sBAAsB,KAAtB,sBAAsB,QAUjC;AAED,MAAM,CAAN,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,uCAAa,CAAA;IACb,yCAAe,CAAA;IACf,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,mDAAyB,CAAA;IACzB,qDAA2B,CAAA;IAC3B,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;AAC/B,CAAC,EAVW,sBAAsB,KAAtB,sBAAsB,QAUjC;AAED,MAAM,CAAN,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;IAC7B,uDAA6B,CAAA;AAC/B,CAAC,EAPW,sBAAsB,KAAtB,sBAAsB,QAOjC","file":"type.js","sourcesContent":["import type {\n  IGroup,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  IPolygonAttribute,\n  IRichTextGraphicAttribute,\n  ISymbolGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { SegmentAttributes, SymbolAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\nimport type { Point } from '../core/type';\n\nexport enum IMarkLineLabelPosition {\n  start = 'start',\n  middle = 'middle',\n  end = 'end',\n  insideStartTop = 'insideStartTop',\n  insideStartBottom = 'insideStartBottom',\n  insideMiddleTop = 'insideMiddleTop',\n  insideMiddleBottom = 'insideMiddleBottom',\n  insideEndTop = 'insideEndTop',\n  insideEndBottom = 'insideEndBottom'\n}\n\nexport enum IMarkAreaLabelPosition {\n  left = 'left',\n  right = 'right',\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideLeft = 'insideLeft',\n  insideRight = 'insideRight',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom'\n}\n\nexport enum IMarkPointItemPosition {\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom',\n  insideMiddle = 'insideMiddle'\n}\n\nexport type IMarkBackgroundAttributes = {\n  /**\n   * 是否绘制背景层\n   */\n  visible: boolean;\n  /**\n   * TODO: 根据文字宽度进行背景 panel size自适应\n   */\n  autoHeight?: boolean;\n  /**\n   * TODO: 根据文高度度进行背景 panel size自适应\n   */\n  autoWidth?: boolean;\n} & Partial<SymbolAttributes>;\n\nexport type IMarkLabel = Omit<TagAttributes, 'x' | 'y' | 'panel'> & {\n  /**\n   * 标签的背景面板配置\n   */\n  panel?: IMarkBackgroundAttributes;\n};\n\nexport type IMarkRef = {\n  /**\n   * 自动旋转，沿着线的方向，默认 true\n   */\n  autoRotate?: boolean;\n  /**\n   * label 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n};\n\nexport type MarkerAttrs = IGroupGraphicAttribute & {\n  type?: 'line' | 'area' | 'point';\n  /**\n   * 是否支持交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * 是否显示marker组件\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 是否将组件在绘制区域内进行剪切\n   * @default true\n   */\n  clipInRange?: boolean;\n  /**\n   * 组件绘制范围配置\n   */\n  limitRect?: {\n    x: number;\n    y: number;\n    width: number;\n    height: number;\n  };\n};\n\nexport type MarkLineAttrs = MarkerAttrs &\n  SegmentAttributes & {\n    type?: 'line';\n    /**\n     * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n     */\n    points: Point[] | Point[][];\n\n    /**\n     * 标签\n     */\n    label?: {\n      /**\n       * label 相对line的位置\n       */\n      position?: keyof typeof IMarkLineLabelPosition;\n      /**\n       * 当 mark 配置了 clip 之后，label 是否自动调整位置\n       */\n      confine?: boolean;\n    } & IMarkRef &\n      IMarkLabel;\n  };\n\nexport type MarkAreaAttrs = MarkerAttrs & {\n  type?: 'area';\n  /**\n   * 构成area的点\n   */\n  points: Point[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof IMarkAreaLabelPosition;\n    /**\n     * 当 mark 配置了 clip 之后，label 是否自动调整位置\n     */\n    confine?: boolean;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n};\n\nexport type IItemContent = IMarkRef & {\n  /**\n   * 标注类型\n   * Tips: 保留'richText'与之前的定义做兼容\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';\n  position?: keyof typeof IMarkPointItemPosition;\n  /**\n   * x 方向偏移量\n   */\n  offsetX?: number;\n  /**\n   * y 方向偏移量\n   */\n  offsetY?: number;\n  /**\n   * type为symbol时, symbol的样式\n   */\n  symbolStyle?: ISymbolGraphicAttribute;\n  /**\n   * type为image时, image的样式\n   */\n  imageStyle?: IImageGraphicAttribute;\n  /**\n   * type为text时, text的配置\n   * 'text'类型的ItemContent新增三种子类型：'text','rich','html'。配置在textStyle.type上，继承自TagAttributes。\n   */\n  textStyle?: IMarkLabel;\n  /**\n   * type为rich text时, rich text的样式\n   */\n  richTextStyle?: IRichTextGraphicAttribute;\n  /**\n   * type为custom时，允许以callback的方式传入需要render的item\n   */\n  renderCustomCallback?: () => IGroup;\n  // /**\n  //  * 当 mark 配置了 clip 之后，label 是否自动调整位置\n  //  */\n  // confine?: boolean;\n};\n\nexport type IItemLine = {\n  /** TODO：'type-opo' */\n  type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';\n  visible?: boolean;\n  /**\n   * 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n   */\n  decorativeLine?: {\n    visible?: boolean;\n    length?: number;\n  };\n} & Omit<SegmentAttributes, 'points'>;\n\nexport type MarkPointAttrs = Omit<MarkerAttrs, 'labelStyle'> & {\n  /**\n   * markPoint的位置（也是path的起点）\n   */\n  position: Point;\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n};\n"]}

package/es/tag/tag.js

@@ -14,13 +14,15 @@ import { AbstractComponent } from "../core/base";
 
 import { measureTextSize } from "../util";
 
+import { DEFAULT_HTML_TEXT_SPEC } from "../constant";
+
 export class Tag extends AbstractComponent {
     constructor(attributes) {
         super(merge({}, Tag.defaultAttributes, attributes)), this.name = "tag";
     }
     render() {
-        var _a;
-        const {text: text = "", textStyle: textStyle = {}, shape: shape = {}, panel: panel = {}, space: space = 4, minWidth: minWidth, maxWidth: maxWidth, padding: padding = 4, visible: visible, state: state} = this.attribute, parsedPadding = normalizePadding(padding), group = this.createOrUpdateChild("tag-content", {
+        var _a, _b, _c;
+        const {text: text = "", textStyle: textStyle = {}, shape: shape = {}, panel: panel = {}, space: space = 4, minWidth: minWidth, maxWidth: maxWidth, padding: padding = 4, visible: visible, state: state, type: type} = this.attribute, parsedPadding = normalizePadding(padding), group = this.createOrUpdateChild("tag-content", {
             x: 0,
             y: 0,
             zIndex: 1
@@ -40,42 +42,88 @@ export class Tag extends AbstractComponent {
             }), "symbol"), isEmpty(null == state ? void 0 : state.shape) || (symbol.states = state.shape), 
             shapeVisible && (symbolPlaceWidth = maxSize + space);
         }
-        tagWidth += symbolPlaceWidth, textX += symbolPlaceWidth;
-        const textAttrs = Object.assign(Object.assign({
-            text: text,
-            visible: isValid(text) && !1 !== visible,
-            lineHeight: null == textStyle ? void 0 : textStyle.fontSize
-        }, textStyle), {
-            x: textX,
-            y: 0
-        });
-        isNil(textAttrs.lineHeight) && (textAttrs.lineHeight = textAttrs.fontSize);
-        const textShape = group.createOrUpdateChild("tag-text", textAttrs, "text");
-        isEmpty(null == state ? void 0 : state.text) || (textShape.states = state.text);
-        const textBounds = measureTextSize(textAttrs.text, textStyle), textWidth = textBounds.width, textHeight = textBounds.height;
-        tagWidth += textWidth;
-        const size = null !== (_a = shape.size) && void 0 !== _a ? _a : 10, maxSize = isNumber(size) ? size : Math.max(size[0], size[1]);
-        tagHeight += Math.max(textHeight, (null == shape ? void 0 : shape.visible) ? maxSize : 0);
-        const {textAlign: textAlign, textBaseline: textBaseline} = textStyle;
-        (isValid(minWidth) || isValid(maxWidth)) && (isValid(minWidth) && tagWidth < minWidth && (tagWidth = minWidth), 
-        isValid(maxWidth) && tagWidth > maxWidth && (tagWidth = maxWidth, textShape.setAttribute("maxLineWidth", maxWidth - parsedPadding[1] - parsedPadding[2])));
-        let x = 0, y = 0;
-        "center" === textAlign ? (x -= tagWidth / 2, symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth / 2), 
-        group.setAttribute("x", -symbolPlaceWidth / 2)) : "right" === textAlign || "end" === textAlign ? (x -= tagWidth, 
-        symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth), group.setAttribute("x", -parsedPadding[1] - symbolPlaceWidth)) : "left" !== textAlign && "start" !== textAlign || group.setAttribute("x", parsedPadding[3]), 
-        "middle" === textBaseline ? (y -= tagHeight / 2, symbol && symbol.setAttribute("y", 0)) : "bottom" === textBaseline ? (y -= tagHeight, 
-        symbol && symbol.setAttribute("y", -textHeight / 2), group.setAttribute("y", -parsedPadding[2])) : "top" === textBaseline && (group.setAttribute("y", parsedPadding[0]), 
-        symbol && symbol.setAttribute("y", textHeight / 2));
-        const {visible: bgVisible} = panel, backgroundStyle = __rest(panel, [ "visible" ]);
-        if (visible && isBoolean(bgVisible)) {
-            const bgRect = this.createOrUpdateChild("tag-panel", Object.assign(Object.assign({}, backgroundStyle), {
-                visible: bgVisible && !!text,
-                x: x,
-                y: y,
-                width: tagWidth,
-                height: tagHeight
-            }), "rect");
-            isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
+        let textShape;
+        if (tagWidth += symbolPlaceWidth, textX += symbolPlaceWidth, "rich" === type) {
+            const richTextAttrs = Object.assign(Object.assign({
+                textConfig: text,
+                visible: isValid(text) && !1 !== visible
+            }, textStyle), {
+                x: textX,
+                y: 0,
+                width: null !== (_a = textStyle.width) && void 0 !== _a ? _a : 0,
+                height: null !== (_b = textStyle.height) && void 0 !== _b ? _b : 0
+            });
+            textShape = group.createOrUpdateChild("tag-text", richTextAttrs, "richtext");
+            const {visible: bgVisible} = panel, backgroundStyle = __rest(panel, [ "visible" ]);
+            if (visible && isBoolean(bgVisible)) {
+                const bgRect = this.createOrUpdateChild("tag-panel", Object.assign(Object.assign({}, backgroundStyle), {
+                    visible: bgVisible && !!text,
+                    x: textShape.AABBBounds.x1,
+                    y: textShape.AABBBounds.y1,
+                    width: textShape.AABBBounds.width(),
+                    height: textShape.AABBBounds.height()
+                }), "rect");
+                isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
+            }
+        } else if ("html" === type) {
+            const richTextAttrs = Object.assign(Object.assign({
+                textConfig: [],
+                visible: isValid(text) && !1 !== visible,
+                html: Object.assign(Object.assign({
+                    dom: text
+                }, DEFAULT_HTML_TEXT_SPEC), textStyle)
+            }, textStyle), {
+                x: textX,
+                y: 0
+            });
+            textShape = group.createOrUpdateChild("tag-text", richTextAttrs, "richtext");
+            const {visible: bgVisible} = panel, backgroundStyle = __rest(panel, [ "visible" ]);
+            if (visible && isBoolean(bgVisible)) {
+                const bgRect = this.createOrUpdateChild("tag-panel", Object.assign(Object.assign({}, backgroundStyle), {
+                    visible: bgVisible && !!text,
+                    x: textShape.AABBBounds.x1,
+                    y: textShape.AABBBounds.y1,
+                    width: textShape.AABBBounds.width(),
+                    height: textShape.AABBBounds.height()
+                }), "rect");
+                isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
+            }
+        } else {
+            const textAttrs = Object.assign(Object.assign({
+                text: text,
+                visible: isValid(text) && !1 !== visible,
+                lineHeight: null == textStyle ? void 0 : textStyle.fontSize
+            }, textStyle), {
+                x: textX,
+                y: 0
+            });
+            isNil(textAttrs.lineHeight) && (textAttrs.lineHeight = textStyle.fontSize), textShape = group.createOrUpdateChild("tag-text", textAttrs, "text"), 
+            isEmpty(null == state ? void 0 : state.text) || (textShape.states = state.text);
+            const textBounds = measureTextSize(textAttrs.text, textStyle), textWidth = textBounds.width, textHeight = textBounds.height;
+            tagWidth += textWidth;
+            const size = null !== (_c = shape.size) && void 0 !== _c ? _c : 10, maxSize = isNumber(size) ? size : Math.max(size[0], size[1]);
+            tagHeight += Math.max(textHeight, (null == shape ? void 0 : shape.visible) ? maxSize : 0);
+            const {textAlign: textAlign, textBaseline: textBaseline} = textStyle;
+            (isValid(minWidth) || isValid(maxWidth)) && (isValid(minWidth) && tagWidth < minWidth && (tagWidth = minWidth), 
+            isValid(maxWidth) && tagWidth > maxWidth && (tagWidth = maxWidth, textShape.setAttribute("maxLineWidth", maxWidth - parsedPadding[1] - parsedPadding[2])));
+            let x = 0, y = 0;
+            "center" === textAlign ? (x -= tagWidth / 2, symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth / 2), 
+            group.setAttribute("x", -symbolPlaceWidth / 2)) : "right" === textAlign || "end" === textAlign ? (x -= tagWidth, 
+            symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth), group.setAttribute("x", -parsedPadding[1] - symbolPlaceWidth)) : "left" !== textAlign && "start" !== textAlign || group.setAttribute("x", parsedPadding[3]), 
+            "middle" === textBaseline ? (y -= tagHeight / 2, symbol && symbol.setAttribute("y", 0)) : "bottom" === textBaseline ? (y -= tagHeight, 
+            symbol && symbol.setAttribute("y", -textHeight / 2), group.setAttribute("y", -parsedPadding[2])) : "top" === textBaseline && (group.setAttribute("y", parsedPadding[0]), 
+            symbol && symbol.setAttribute("y", textHeight / 2));
+            const {visible: bgVisible} = panel, backgroundStyle = __rest(panel, [ "visible" ]);
+            if (visible && isBoolean(bgVisible)) {
+                const bgRect = this.createOrUpdateChild("tag-panel", Object.assign(Object.assign({}, backgroundStyle), {
+                    visible: bgVisible && !!text,
+                    x: x,
+                    y: y,
+                    width: tagWidth,
+                    height: tagHeight
+                }), "rect");
+                isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
+            }
         }
     }
 }

package/es/tag/tag.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/tag/tag.ts"],"names":[],"mappings":"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","file":"tag.js","sourcesContent":["/**\n * @description 标签组件\n */\nimport type { IGroup, IRect, ISymbol, IText, ITextAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';\nimport { isBoolean, isEmpty, isNil, isNumber, isValid, merge, normalizePadding } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { measureTextSize } from '../util';\nimport type { BackgroundAttributes } from '../interface';\nimport type { TagAttributes, TagShapeAttributes } from './type';\n\nexport class Tag extends AbstractComponent<Required<TagAttributes>> {\n  name = 'tag';\n\n  static defaultAttributes: Partial<TagAttributes> = {\n    visible: true,\n    textStyle: {\n      fontSize: 12,\n      fill: '#000',\n      textAlign: 'left',\n      textBaseline: 'top'\n    },\n    space: 4,\n    padding: 4,\n    // @ts-ignore\n    shape: {\n      fill: '#000'\n    }\n  };\n\n  constructor(attributes: TagAttributes) {\n    super(merge({}, Tag.defaultAttributes, attributes));\n  }\n\n  protected render() {\n    const {\n      text = '',\n      textStyle = {} as ITextGraphicAttribute,\n      shape = {} as TagShapeAttributes,\n      panel = {} as BackgroundAttributes,\n      space = 4,\n      minWidth,\n      maxWidth,\n      padding = 4,\n      visible,\n      state\n    } = this.attribute as TagAttributes;\n    const parsedPadding = normalizePadding(padding);\n\n    const group = this.createOrUpdateChild('tag-content', { x: 0, y: 0, zIndex: 1 }, 'group') as IGroup;\n\n    let symbol;\n    let tagWidth = parsedPadding[1] + parsedPadding[3];\n    let tagHeight = parsedPadding[0] + parsedPadding[2];\n    let textX = 0;\n    let symbolPlaceWidth = 0;\n    const { visible: shapeVisible, ...shapeStyle } = shape;\n    if (isBoolean(shapeVisible)) {\n      const size = shapeStyle?.size || 10;\n      const maxSize = isNumber(size) ? size : Math.max(size[0], size[1]);\n\n      symbol = group.createOrUpdateChild(\n        'tag-shape',\n        {\n          symbolType: 'circle',\n          size,\n          strokeBoundsBuffer: 0,\n          ...shapeStyle,\n          visible: shapeVisible,\n          x: maxSize / 2,\n          y: maxSize / 2\n        },\n        'symbol'\n      ) as ISymbol;\n      if (!isEmpty(state?.shape)) {\n        symbol.states = state.shape;\n      }\n\n      if (shapeVisible) {\n        symbolPlaceWidth = maxSize + space;\n      }\n    }\n\n    tagWidth += symbolPlaceWidth;\n    textX += symbolPlaceWidth;\n\n    const textAttrs = {\n      text,\n      visible: isValid(text) && visible !== false,\n      lineHeight: textStyle?.fontSize,\n      ...textStyle,\n      x: textX,\n      y: 0\n    };\n    if (isNil(textAttrs.lineHeight)) {\n      textAttrs.lineHeight = textAttrs.fontSize;\n    }\n    const textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text') as IText;\n    if (!isEmpty(state?.text)) {\n      textShape.states = state.text;\n    }\n\n    // 因为文本可能发生旋转，所以需要使用 measureTextSize 方法\n    const textBounds = measureTextSize(textAttrs.text, textStyle);\n    const textWidth = textBounds.width;\n    const textHeight = textBounds.height;\n    tagWidth += textWidth;\n    const size = shape.size ?? 10;\n    const maxSize = isNumber(size) ? size : Math.max(size[0], size[1]);\n    tagHeight += Math.max(textHeight, shape?.visible ? maxSize : 0);\n\n    const { textAlign, textBaseline } = textStyle as ITextAttribute;\n\n    if (isValid(minWidth) || isValid(maxWidth)) {\n      if (isValid(minWidth) && tagWidth < minWidth) {\n        tagWidth = minWidth;\n      }\n      if (isValid(maxWidth) && tagWidth > maxWidth) {\n        tagWidth = maxWidth;\n        textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);\n      }\n    }\n\n    let x = 0;\n    let y = 0;\n    if (textAlign === 'center') {\n      x -= tagWidth / 2;\n      if (symbol) {\n        symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);\n      }\n\n      group.setAttribute('x', -symbolPlaceWidth / 2);\n    } else if (textAlign === 'right' || textAlign === 'end') {\n      x -= tagWidth;\n      if (symbol) {\n        symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);\n      }\n\n      group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);\n    } else if (textAlign === 'left' || textAlign === 'start') {\n      group.setAttribute('x', parsedPadding[3]);\n    }\n    if (textBaseline === 'middle') {\n      y -= tagHeight / 2;\n      if (symbol) {\n        symbol.setAttribute('y', 0);\n      }\n    } else if (textBaseline === 'bottom') {\n      y -= tagHeight;\n      if (symbol) {\n        symbol.setAttribute('y', -textHeight / 2);\n      }\n\n      group.setAttribute('y', -parsedPadding[2]);\n    } else if (textBaseline === 'top') {\n      group.setAttribute('y', parsedPadding[0]);\n      if (symbol) {\n        symbol.setAttribute('y', textHeight / 2);\n      }\n    }\n\n    // 绘制背景层\n    const { visible: bgVisible, ...backgroundStyle } = panel;\n    if (visible && isBoolean(bgVisible)) {\n      const bgRect = this.createOrUpdateChild(\n        'tag-panel',\n        {\n          ...backgroundStyle,\n          visible: bgVisible && !!text,\n          x,\n          y,\n          width: tagWidth,\n          height: tagHeight\n        },\n        'rect'\n      ) as IRect;\n      if (!isEmpty(state?.panel)) {\n        bgRect.states = state.panel;\n      }\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/tag/tag.ts"],"names":[],"mappings":"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","file":"tag.js","sourcesContent":["/**\n * @description 标签组件\n */\nimport type {\n  IGroup,\n  IRect,\n  ISymbol,\n  IText,\n  ITextAttribute,\n  ITextGraphicAttribute,\n  IRichTextGraphicAttribute,\n  IRichText,\n  IRichTextCharacter\n} from '@visactor/vrender-core';\nimport { isBoolean, isEmpty, isNil, isNumber, isValid, merge, normalizePadding } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { measureTextSize } from '../util';\nimport type { BackgroundAttributes } from '../interface';\nimport type { TagAttributes, TagShapeAttributes } from './type';\nimport { DEFAULT_HTML_TEXT_SPEC } from '../constant';\n\nexport class Tag extends AbstractComponent<Required<TagAttributes>> {\n  name = 'tag';\n\n  static defaultAttributes: Partial<TagAttributes> = {\n    visible: true,\n    textStyle: {\n      fontSize: 12,\n      fill: '#000',\n      textAlign: 'left',\n      textBaseline: 'top'\n    },\n    space: 4,\n    padding: 4,\n    // @ts-ignore\n    shape: {\n      fill: '#000'\n    }\n  };\n\n  constructor(attributes: TagAttributes) {\n    super(merge({}, Tag.defaultAttributes, attributes));\n  }\n\n  protected render() {\n    const {\n      text = '',\n      textStyle = {} as ITextGraphicAttribute | IRichTextGraphicAttribute,\n      shape = {} as TagShapeAttributes,\n      panel = {} as BackgroundAttributes,\n      space = 4,\n      minWidth,\n      maxWidth,\n      padding = 4,\n      visible,\n      state,\n      type\n    } = this.attribute as TagAttributes;\n    const parsedPadding = normalizePadding(padding);\n\n    const group = this.createOrUpdateChild('tag-content', { x: 0, y: 0, zIndex: 1 }, 'group') as IGroup;\n\n    let symbol;\n    let tagWidth = parsedPadding[1] + parsedPadding[3];\n    let tagHeight = parsedPadding[0] + parsedPadding[2];\n    let textX = 0;\n    let symbolPlaceWidth = 0;\n    const { visible: shapeVisible, ...shapeStyle } = shape;\n    if (isBoolean(shapeVisible)) {\n      const size = shapeStyle?.size || 10;\n      const maxSize = isNumber(size) ? size : Math.max(size[0], size[1]);\n\n      symbol = group.createOrUpdateChild(\n        'tag-shape',\n        {\n          symbolType: 'circle',\n          size,\n          strokeBoundsBuffer: 0,\n          ...shapeStyle,\n          visible: shapeVisible,\n          x: maxSize / 2,\n          y: maxSize / 2\n        },\n        'symbol'\n      ) as ISymbol;\n      if (!isEmpty(state?.shape)) {\n        symbol.states = state.shape;\n      }\n\n      if (shapeVisible) {\n        symbolPlaceWidth = maxSize + space;\n      }\n    }\n\n    tagWidth += symbolPlaceWidth;\n    textX += symbolPlaceWidth;\n\n    let textShape;\n    if (type === 'rich') {\n      const richTextAttrs = {\n        textConfig: text as IRichTextCharacter[],\n        visible: isValid(text) && visible !== false,\n        ...(textStyle as IRichTextGraphicAttribute),\n        x: textX,\n        y: 0,\n        width: (textStyle as IRichTextGraphicAttribute).width ?? 0,\n        height: (textStyle as IRichTextGraphicAttribute).height ?? 0\n      };\n      textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext') as IRichText;\n\n      // 绘制背景层\n      const { visible: bgVisible, ...backgroundStyle } = panel;\n      if (visible && isBoolean(bgVisible)) {\n        const bgRect = this.createOrUpdateChild(\n          'tag-panel',\n          {\n            ...backgroundStyle,\n            visible: bgVisible && !!text,\n            x: textShape.AABBBounds.x1,\n            y: textShape.AABBBounds.y1,\n            width: textShape.AABBBounds.width(),\n            height: textShape.AABBBounds.height()\n          },\n          'rect'\n        ) as IRect;\n        if (!isEmpty(state?.panel)) {\n          bgRect.states = state.panel;\n        }\n      }\n    } else if (type === 'html') {\n      const richTextAttrs = {\n        textConfig: [] as IRichTextCharacter[],\n        visible: isValid(text) && visible !== false,\n        html: {\n          dom: text as string,\n          ...DEFAULT_HTML_TEXT_SPEC,\n          ...textStyle\n        },\n        ...(textStyle as IRichTextGraphicAttribute),\n        x: textX,\n        y: 0\n      };\n      textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext') as IRichText;\n\n      // 绘制背景层\n      const { visible: bgVisible, ...backgroundStyle } = panel;\n      if (visible && isBoolean(bgVisible)) {\n        const bgRect = this.createOrUpdateChild(\n          'tag-panel',\n          {\n            ...backgroundStyle,\n            visible: bgVisible && !!text,\n            x: textShape.AABBBounds.x1,\n            y: textShape.AABBBounds.y1,\n            width: textShape.AABBBounds.width(),\n            height: textShape.AABBBounds.height()\n          },\n          'rect'\n        ) as IRect;\n        if (!isEmpty(state?.panel)) {\n          bgRect.states = state.panel;\n        }\n      }\n    } else {\n      const textAttrs = {\n        text: text as string | number | string[] | number[],\n        visible: isValid(text) && visible !== false,\n        lineHeight: (textStyle as ITextGraphicAttribute)?.fontSize,\n        ...(textStyle as ITextGraphicAttribute),\n        x: textX,\n        y: 0\n      };\n      if (isNil(textAttrs.lineHeight)) {\n        textAttrs.lineHeight = (textStyle as ITextGraphicAttribute).fontSize;\n      }\n      textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text') as IText;\n      if (!isEmpty(state?.text)) {\n        textShape.states = state.text;\n      }\n\n      // 因为文本可能发生旋转，所以需要使用 measureTextSize 方法\n      const textBounds = measureTextSize(textAttrs.text as string, textStyle);\n      const textWidth = textBounds.width;\n      const textHeight = textBounds.height;\n      tagWidth += textWidth;\n      const size = shape.size ?? 10;\n      const maxSize = isNumber(size) ? size : Math.max(size[0], size[1]);\n      tagHeight += Math.max(textHeight, shape?.visible ? maxSize : 0);\n\n      const { textAlign, textBaseline } = textStyle as ITextAttribute;\n\n      if (isValid(minWidth) || isValid(maxWidth)) {\n        if (isValid(minWidth) && tagWidth < minWidth) {\n          tagWidth = minWidth;\n        }\n        if (isValid(maxWidth) && tagWidth > maxWidth) {\n          tagWidth = maxWidth;\n          textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);\n        }\n      }\n\n      let x = 0;\n      let y = 0;\n      if (textAlign === 'center') {\n        x -= tagWidth / 2;\n        if (symbol) {\n          symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);\n        }\n\n        group.setAttribute('x', -symbolPlaceWidth / 2);\n      } else if (textAlign === 'right' || textAlign === 'end') {\n        x -= tagWidth;\n        if (symbol) {\n          symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);\n        }\n\n        group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);\n      } else if (textAlign === 'left' || textAlign === 'start') {\n        group.setAttribute('x', parsedPadding[3]);\n      }\n      if (textBaseline === 'middle') {\n        y -= tagHeight / 2;\n        if (symbol) {\n          symbol.setAttribute('y', 0);\n        }\n      } else if (textBaseline === 'bottom') {\n        y -= tagHeight;\n        if (symbol) {\n          symbol.setAttribute('y', -textHeight / 2);\n        }\n\n        group.setAttribute('y', -parsedPadding[2]);\n      } else if (textBaseline === 'top') {\n        group.setAttribute('y', parsedPadding[0]);\n        if (symbol) {\n          symbol.setAttribute('y', textHeight / 2);\n        }\n      }\n\n      // 绘制背景层\n      const { visible: bgVisible, ...backgroundStyle } = panel;\n      if (visible && isBoolean(bgVisible)) {\n        const bgRect = this.createOrUpdateChild(\n          'tag-panel',\n          {\n            ...backgroundStyle,\n            visible: bgVisible && !!text,\n            x,\n            y,\n            width: tagWidth,\n            height: tagHeight\n          },\n          'rect'\n        ) as IRect;\n        if (!isEmpty(state?.panel)) {\n          bgRect.states = state.panel;\n        }\n      }\n    }\n  }\n}\n"]}

package/es/tag/type.d.ts

@@ -1,5 +1,5 @@
-import type { ITextGraphicAttribute, ISymbolGraphicAttribute, IGroupGraphicAttribute, IRectGraphicAttribute } from '@visactor/vrender-core';
-import type { Padding, State } from '../core/type';
+import type { ITextGraphicAttribute, ISymbolGraphicAttribute, IGroupGraphicAttribute, IRectGraphicAttribute, IRichTextGraphicAttribute } from '@visactor/vrender-core';
+import type { Padding, State, TextContent } from '../core/type';
 import type { BackgroundAttributes } from '../interface';
 type StateStyle = {
     text?: State<Partial<ITextGraphicAttribute>>;
@@ -7,8 +7,7 @@ type StateStyle = {
     panel?: State<Partial<IRectGraphicAttribute>>;
 };
 export type TagAttributes = {
-    text?: string | string[] | number | number[];
-    textStyle?: Partial<ITextGraphicAttribute>;
+    textStyle?: Partial<ITextGraphicAttribute> | Partial<IRichTextGraphicAttribute>;
     shape?: TagShapeAttributes;
     space?: number;
     padding?: Padding;
@@ -17,7 +16,7 @@ export type TagAttributes = {
     maxWidth?: number;
     visible?: boolean;
     state?: StateStyle;
-} & Omit<IGroupGraphicAttribute, 'background'>;
+} & Omit<IGroupGraphicAttribute, 'background'> & TextContent;
 export type TagShapeAttributes = {
     visible: boolean;
 } & Partial<ISymbolGraphicAttribute>;

package/es/tag/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/tag/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n  ITextGraphicAttribute,\n  ISymbolGraphicAttribute,\n  IGroupGraphicAttribute,\n  IRectGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { Padding, State } from '../core/type';\nimport type { BackgroundAttributes } from '../interface';\n\ntype StateStyle = {\n  /**\n   * text 文本的状态配置\n   */\n  text?: State<Partial<ITextGraphicAttribute>>;\n  /**\n   * shape 标记的状态配置\n   */\n  shape?: State<Partial<ISymbolGraphicAttribute>>;\n  /**\n   * panel 背景的状态配置ß\n   */\n  panel?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type TagAttributes = {\n  /**\n   * 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   */\n  text?: string | string[] | number | number[];\n  /** 文本样式 */\n  textStyle?: Partial<ITextGraphicAttribute>;\n  /** 文本前 mark 图元 */\n  shape?: TagShapeAttributes;\n  /**\n   * shape 同文本之间的间距\n   */\n  space?: number;\n  /**\n   * 内部边距\n   */\n  padding?: Padding;\n  /**\n   * 标签的背景面板配置, TODO: 支持symbol形状\n   */\n  panel?: BackgroundAttributes;\n  /**\n   * 最小宽度，像素值\n   * @default 30\n   */\n  minWidth?: number;\n  /**\n   * 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  visible?: boolean;\n  state?: StateStyle;\n} & Omit<IGroupGraphicAttribute, 'background'>;\n\nexport type TagShapeAttributes = {\n  /**\n   * 是否展示 shape\n   */\n  visible: boolean;\n} & Partial<ISymbolGraphicAttribute>;\n"]}
+{"version":3,"sources":["../src/tag/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n  ITextGraphicAttribute,\n  ISymbolGraphicAttribute,\n  IGroupGraphicAttribute,\n  IRectGraphicAttribute,\n  IRichTextCharacter,\n  IRichTextGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { Padding, State, TextContent } from '../core/type';\nimport type { BackgroundAttributes } from '../interface';\n\ntype StateStyle = {\n  /**\n   * text 文本的状态配置\n   */\n  text?: State<Partial<ITextGraphicAttribute>>;\n  /**\n   * shape 标记的状态配置\n   */\n  shape?: State<Partial<ISymbolGraphicAttribute>>;\n  /**\n   * panel 背景的状态配置ß\n   */\n  panel?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type TagAttributes = {\n  /** 文本样式 */\n  textStyle?: Partial<ITextGraphicAttribute> | Partial<IRichTextGraphicAttribute>;\n  /** 文本前 mark 图元 */\n  shape?: TagShapeAttributes;\n  /**\n   * shape 同文本之间的间距\n   */\n  space?: number;\n  /**\n   * 内部边距\n   */\n  padding?: Padding;\n  /**\n   * 标签的背景面板配置, TODO: 支持symbol形状\n   */\n  panel?: BackgroundAttributes;\n  /**\n   * 最小宽度，像素值\n   * @default 30\n   */\n  minWidth?: number;\n  /**\n   * 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  visible?: boolean;\n  state?: StateStyle;\n} & Omit<IGroupGraphicAttribute, 'background'> &\n  TextContent;\n\nexport type TagShapeAttributes = {\n  /**\n   * 是否展示 shape\n   */\n  visible: boolean;\n} & Partial<ISymbolGraphicAttribute>;\n"]}

package/es/title/title.js

@@ -2,19 +2,21 @@ import { merge, isValid, normalizePadding } from "@visactor/vutils";
 
 import { AbstractComponent } from "../core/base";
 
+import { DEFAULT_HTML_TEXT_SPEC } from "../constant";
+
 export class Title extends AbstractComponent {
     constructor(attributes) {
         super(merge({}, Title.defaultAttributes, attributes)), this.name = "title";
     }
     render() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37;
-        const {text: text, textStyle: textStyle, subtext: subtext, subtextStyle: subtextStyle, width: width, height: height, minWidth: minWidth, maxWidth: maxWidth, minHeight: minHeight, maxHeight: maxHeight, align: align, verticalAlign: verticalAlign, padding: padding = 0} = this.attribute, parsedPadding = normalizePadding(padding), group = this.createOrUpdateChild("title-container", {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55;
+        const {textType: textType, text: text, subtextType: subtextType, textStyle: textStyle, subtext: subtext, subtextStyle: subtextStyle, width: width, height: height, minWidth: minWidth, maxWidth: maxWidth, minHeight: minHeight, maxHeight: maxHeight, align: align, verticalAlign: verticalAlign, padding: padding = 0} = this.attribute, parsedPadding = normalizePadding(padding), group = this.createOrUpdateChild("title-container", {
             x: parsedPadding[3],
             y: parsedPadding[0],
             zIndex: 1
         }, "group");
-        if (!1 !== (null === (_a = this.attribute) || void 0 === _a ? void 0 : _a.visible) && !1 !== (null == textStyle ? void 0 : textStyle.visible)) if (textStyle && isValid(null == textStyle ? void 0 : textStyle.character)) {
-            const attr = {
+        if (!1 !== (null === (_a = this.attribute) || void 0 === _a ? void 0 : _a.visible) && !1 !== (null == textStyle ? void 0 : textStyle.visible)) if ("rich" === textType || isValid(textStyle.character)) {
+            const attr = Object.assign({
                 x: null !== (_b = textStyle.x) && void 0 !== _b ? _b : 0,
                 y: null !== (_c = textStyle.y) && void 0 !== _c ? _c : 0,
                 width: null !== (_e = null !== (_d = textStyle.width) && void 0 !== _d ? _d : width) && void 0 !== _e ? _e : 0,
@@ -23,84 +25,116 @@ export class Title extends AbstractComponent {
                 wordBreak: null !== (_j = textStyle.wordBreak) && void 0 !== _j ? _j : "break-word",
                 maxHeight: textStyle.maxHeight,
                 maxWidth: textStyle.maxWidth,
-                textConfig: textStyle.character
-            };
+                textConfig: null !== (_k = textStyle.character) && void 0 !== _k ? _k : text
+            }, textStyle);
+            this._mainTitle = group.createOrUpdateChild("mainTitle", attr, "richtext");
+        } else if ("html" === textType) {
+            const attr = Object.assign({
+                html: Object.assign(Object.assign({
+                    dom: text
+                }, DEFAULT_HTML_TEXT_SPEC), textStyle),
+                x: null !== (_l = textStyle.x) && void 0 !== _l ? _l : 0,
+                y: null !== (_m = textStyle.y) && void 0 !== _m ? _m : 0,
+                width: null !== (_p = null !== (_o = textStyle.width) && void 0 !== _o ? _o : width) && void 0 !== _p ? _p : 0,
+                height: null !== (_r = null !== (_q = textStyle.height) && void 0 !== _q ? _q : height) && void 0 !== _r ? _r : 0,
+                ellipsis: null === (_s = textStyle.ellipsis) || void 0 === _s || _s,
+                wordBreak: null !== (_t = textStyle.wordBreak) && void 0 !== _t ? _t : "break-word",
+                maxHeight: textStyle.maxHeight,
+                maxWidth: textStyle.maxWidth,
+                textConfig: []
+            }, textStyle);
             this._mainTitle = group.createOrUpdateChild("mainTitle", attr, "richtext");
         } else isValid(text) && (this._mainTitle = group.createOrUpdateChild("mainTitle", Object.assign(Object.assign({
             text: [ text ]
         }, textStyle), {
-            maxLineWidth: null !== (_k = null == textStyle ? void 0 : textStyle.maxLineWidth) && void 0 !== _k ? _k : width,
+            maxLineWidth: null !== (_u = null == textStyle ? void 0 : textStyle.maxLineWidth) && void 0 !== _u ? _u : width,
             heightLimit: null == textStyle ? void 0 : textStyle.heightLimit,
             lineClamp: null == textStyle ? void 0 : textStyle.lineClamp,
-            ellipsis: null === (_l = null == textStyle ? void 0 : textStyle.ellipsis) || void 0 === _l || _l,
+            ellipsis: null === (_v = null == textStyle ? void 0 : textStyle.ellipsis) || void 0 === _v || _v,
             x: 0,
             y: 0
         }), "wrapText"));
-        const maintextHeight = this._mainTitle ? null === (_m = this._mainTitle) || void 0 === _m ? void 0 : _m.AABBBounds.height() : 0, maintextWidth = this._mainTitle ? null === (_o = this._mainTitle) || void 0 === _o ? void 0 : _o.AABBBounds.width() : 0;
-        if (!1 !== (null === (_p = this.attribute) || void 0 === _p ? void 0 : _p.visible) && !1 !== (null == subtextStyle ? void 0 : subtextStyle.visible)) if (subtextStyle && isValid(null == subtextStyle ? void 0 : subtextStyle.character)) {
-            const attr = {
-                x: null !== (_q = subtextStyle.x) && void 0 !== _q ? _q : 0,
-                y: null !== (_r = subtextStyle.y) && void 0 !== _r ? _r : maintextHeight,
-                width: null !== (_t = null !== (_s = subtextStyle.width) && void 0 !== _s ? _s : width) && void 0 !== _t ? _t : 0,
-                height: null !== (_v = null !== (_u = subtextStyle.height) && void 0 !== _u ? _u : height) && void 0 !== _v ? _v : 0,
-                ellipsis: null === (_w = subtextStyle.ellipsis) || void 0 === _w || _w,
-                wordBreak: null !== (_x = subtextStyle.wordBreak) && void 0 !== _x ? _x : "break-word",
+        const maintextHeight = this._mainTitle ? null === (_w = this._mainTitle) || void 0 === _w ? void 0 : _w.AABBBounds.height() : 0, maintextWidth = this._mainTitle ? null === (_x = this._mainTitle) || void 0 === _x ? void 0 : _x.AABBBounds.width() : 0;
+        if (!1 !== (null === (_y = this.attribute) || void 0 === _y ? void 0 : _y.visible) && !1 !== (null == subtextStyle ? void 0 : subtextStyle.visible)) if ("rich" === subtextType || isValid(subtextStyle.character)) {
+            const attr = Object.assign({
+                x: null !== (_z = subtextStyle.x) && void 0 !== _z ? _z : 0,
+                y: null !== (_0 = subtextStyle.y) && void 0 !== _0 ? _0 : 0,
+                width: null !== (_2 = null !== (_1 = subtextStyle.width) && void 0 !== _1 ? _1 : width) && void 0 !== _2 ? _2 : 0,
+                height: null !== (_4 = null !== (_3 = subtextStyle.height) && void 0 !== _3 ? _3 : height) && void 0 !== _4 ? _4 : 0,
+                ellipsis: null === (_5 = subtextStyle.ellipsis) || void 0 === _5 || _5,
+                wordBreak: null !== (_6 = subtextStyle.wordBreak) && void 0 !== _6 ? _6 : "break-word",
+                maxHeight: subtextStyle.maxHeight,
+                maxWidth: subtextStyle.maxWidth,
+                textConfig: null !== (_7 = subtextStyle.character) && void 0 !== _7 ? _7 : subtext
+            }, subtextStyle);
+            this._subTitle = group.createOrUpdateChild("subTitle", attr, "richtext");
+        } else if ("html" === subtextType) {
+            const attr = Object.assign({
+                html: Object.assign(Object.assign({
+                    dom: subtext
+                }, DEFAULT_HTML_TEXT_SPEC), subtextStyle),
+                x: null !== (_8 = subtextStyle.x) && void 0 !== _8 ? _8 : 0,
+                y: null !== (_9 = subtextStyle.y) && void 0 !== _9 ? _9 : 0,
+                width: null !== (_11 = null !== (_10 = subtextStyle.width) && void 0 !== _10 ? _10 : width) && void 0 !== _11 ? _11 : 0,
+                height: null !== (_13 = null !== (_12 = subtextStyle.height) && void 0 !== _12 ? _12 : height) && void 0 !== _13 ? _13 : 0,
+                ellipsis: null === (_14 = subtextStyle.ellipsis) || void 0 === _14 || _14,
+                wordBreak: null !== (_15 = subtextStyle.wordBreak) && void 0 !== _15 ? _15 : "break-word",
                 maxHeight: subtextStyle.maxHeight,
                 maxWidth: subtextStyle.maxWidth,
-                textConfig: subtextStyle.character
-            };
+                textConfig: []
+            }, subtextStyle);
             this._subTitle = group.createOrUpdateChild("subTitle", attr, "richtext");
         } else isValid(subtext) && (this._subTitle = group.createOrUpdateChild("subTitle", Object.assign(Object.assign({
             text: [ subtext ]
         }, subtextStyle), {
-            maxLineWidth: null !== (_y = null == subtextStyle ? void 0 : subtextStyle.maxLineWidth) && void 0 !== _y ? _y : width,
+            maxLineWidth: null !== (_16 = null == subtextStyle ? void 0 : subtextStyle.maxLineWidth) && void 0 !== _16 ? _16 : width,
             heightLimit: null == subtextStyle ? void 0 : subtextStyle.heightLimit,
             lineClamp: null == subtextStyle ? void 0 : subtextStyle.lineClamp,
-            ellipsis: null === (_z = null == subtextStyle ? void 0 : subtextStyle.ellipsis) || void 0 === _z || _z,
+            ellipsis: null === (_17 = null == subtextStyle ? void 0 : subtextStyle.ellipsis) || void 0 === _17 || _17,
             x: 0,
             y: maintextHeight
         }), "wrapText"));
-        const subtextHeight = this._subTitle ? null === (_0 = this._subTitle) || void 0 === _0 ? void 0 : _0.AABBBounds.height() : 0, subtextWidth = this._subTitle ? null === (_1 = this._subTitle) || void 0 === _1 ? void 0 : _1.AABBBounds.width() : 0;
-        let titleWidth = Math.max(maintextWidth, subtextWidth), titleHeight = maintextHeight + (null !== (_2 = null == subtextStyle ? void 0 : subtextStyle.height) && void 0 !== _2 ? _2 : subtextHeight);
-        if (isValid(width) && (titleWidth = width, null === (_3 = this._mainTitle) || void 0 === _3 || _3.setAttribute("maxLineWidth", width), 
-        null === (_4 = this._subTitle) || void 0 === _4 || _4.setAttribute("maxLineWidth", width)), 
+        const subtextHeight = this._subTitle ? null === (_18 = this._subTitle) || void 0 === _18 ? void 0 : _18.AABBBounds.height() : 0, subtextWidth = this._subTitle ? null === (_19 = this._subTitle) || void 0 === _19 ? void 0 : _19.AABBBounds.width() : 0;
+        let titleWidth = Math.max(maintextWidth, subtextWidth), titleHeight = maintextHeight + (null !== (_20 = null == subtextStyle ? void 0 : subtextStyle.height) && void 0 !== _20 ? _20 : subtextHeight);
+        if (isValid(width) && (titleWidth = width, null === (_21 = this._mainTitle) || void 0 === _21 || _21.setAttribute("maxLineWidth", width), 
+        null === (_22 = this._subTitle) || void 0 === _22 || _22.setAttribute("maxLineWidth", width)), 
         isValid(height) && (titleHeight = height), isValid(minWidth) && titleWidth < minWidth && (titleWidth = minWidth), 
-        isValid(maxWidth) && (null === (_5 = this._mainTitle) || void 0 === _5 || _5.setAttribute("maxLineWidth", maxWidth), 
-        null === (_6 = this._subTitle) || void 0 === _6 || _6.setAttribute("maxLineWidth", maxWidth), 
-        null === (_7 = this._mainTitle) || void 0 === _7 || _7.setAttribute("maxWidth", maxWidth), 
-        null === (_8 = this._subTitle) || void 0 === _8 || _8.setAttribute("maxWidth", maxWidth), 
+        isValid(maxWidth) && (null === (_23 = this._mainTitle) || void 0 === _23 || _23.setAttribute("maxLineWidth", maxWidth), 
+        null === (_24 = this._subTitle) || void 0 === _24 || _24.setAttribute("maxLineWidth", maxWidth), 
+        null === (_25 = this._mainTitle) || void 0 === _25 || _25.setAttribute("maxWidth", maxWidth), 
+        null === (_26 = this._subTitle) || void 0 === _26 || _26.setAttribute("maxWidth", maxWidth), 
         titleWidth > maxWidth && (titleWidth = maxWidth)), isValid(minHeight) && titleHeight < minHeight && (titleHeight = minHeight), 
-        isValid(maxHeight) && (null === (_9 = this._mainTitle) || void 0 === _9 || _9.setAttribute("maxHeight", maxHeight), 
-        null === (_10 = this._subTitle) || void 0 === _10 || _10.setAttribute("maxHeight", maxHeight - maintextHeight), 
+        isValid(maxHeight) && (null === (_27 = this._mainTitle) || void 0 === _27 || _27.setAttribute("maxHeight", maxHeight), 
+        null === (_28 = this._subTitle) || void 0 === _28 || _28.setAttribute("maxHeight", maxHeight - maintextHeight), 
         titleHeight > maxHeight && (titleHeight = maxHeight)), group.attribute.width = titleWidth, 
         group.attribute.height = titleHeight, group.attribute.boundsPadding = parsedPadding, 
         isValid(align) || isValid(null == textStyle ? void 0 : textStyle.align)) {
-            const mainTitleAlign = (null == textStyle ? void 0 : textStyle.align) ? null == textStyle ? void 0 : textStyle.align : align, mainTitleWidth = null !== (_11 = null == textStyle ? void 0 : textStyle.width) && void 0 !== _11 ? _11 : maintextWidth;
-            "left" === mainTitleAlign ? (null === (_12 = this._mainTitle) || void 0 === _12 || _12.setAttribute("x", 0), 
-            null === (_13 = this._mainTitle) || void 0 === _13 || _13.setAttribute("textAlign", "left")) : "center" === mainTitleAlign ? (null === (_14 = this._mainTitle) || void 0 === _14 || _14.setAttribute("x", mainTitleWidth / 2), 
-            null === (_15 = this._mainTitle) || void 0 === _15 || _15.setAttribute("textAlign", "center")) : "right" === mainTitleAlign && (null === (_16 = this._mainTitle) || void 0 === _16 || _16.setAttribute("x", mainTitleWidth), 
-            null === (_17 = this._mainTitle) || void 0 === _17 || _17.setAttribute("textAlign", "right"));
+            const mainTitleAlign = (null == textStyle ? void 0 : textStyle.align) ? null == textStyle ? void 0 : textStyle.align : align, mainTitleWidth = null !== (_29 = null == textStyle ? void 0 : textStyle.width) && void 0 !== _29 ? _29 : maintextWidth;
+            "left" === mainTitleAlign ? (null === (_30 = this._mainTitle) || void 0 === _30 || _30.setAttribute("x", 0), 
+            null === (_31 = this._mainTitle) || void 0 === _31 || _31.setAttribute("textAlign", "left")) : "center" === mainTitleAlign ? (null === (_32 = this._mainTitle) || void 0 === _32 || _32.setAttribute("x", mainTitleWidth / 2), 
+            null === (_33 = this._mainTitle) || void 0 === _33 || _33.setAttribute("textAlign", "center")) : "right" === mainTitleAlign && (null === (_34 = this._mainTitle) || void 0 === _34 || _34.setAttribute("x", mainTitleWidth), 
+            null === (_35 = this._mainTitle) || void 0 === _35 || _35.setAttribute("textAlign", "right"));
         }
         if (isValid(verticalAlign) || isValid(null == textStyle ? void 0 : textStyle.verticalAlign)) {
             const mainTitleVerticalAlign = (null == textStyle ? void 0 : textStyle.verticalAlign) ? null == textStyle ? void 0 : textStyle.verticalAlign : verticalAlign, mainTitleHeight = (null == textStyle ? void 0 : textStyle.height) ? null == textStyle ? void 0 : textStyle.height : titleHeight;
-            "top" === mainTitleVerticalAlign ? (null === (_18 = this._mainTitle) || void 0 === _18 || _18.setAttribute("y", 0), 
-            null === (_19 = this._mainTitle) || void 0 === _19 || _19.setAttribute("textBaseline", "top")) : "middle" === mainTitleVerticalAlign ? (null === (_20 = this._mainTitle) || void 0 === _20 || _20.setAttribute("y", mainTitleHeight / 2), 
-            null === (_21 = this._mainTitle) || void 0 === _21 || _21.setAttribute("textBaseline", "middle")) : "bottom" === mainTitleVerticalAlign && (null === (_22 = this._mainTitle) || void 0 === _22 || _22.setAttribute("y", mainTitleHeight), 
-            null === (_23 = this._mainTitle) || void 0 === _23 || _23.setAttribute("textBaseline", "bottom"));
+            "top" === mainTitleVerticalAlign ? (null === (_36 = this._mainTitle) || void 0 === _36 || _36.setAttribute("y", 0), 
+            null === (_37 = this._mainTitle) || void 0 === _37 || _37.setAttribute("textBaseline", "top")) : "middle" === mainTitleVerticalAlign ? (null === (_38 = this._mainTitle) || void 0 === _38 || _38.setAttribute("y", mainTitleHeight / 2), 
+            null === (_39 = this._mainTitle) || void 0 === _39 || _39.setAttribute("textBaseline", "middle")) : "bottom" === mainTitleVerticalAlign && (null === (_40 = this._mainTitle) || void 0 === _40 || _40.setAttribute("y", mainTitleHeight), 
+            null === (_41 = this._mainTitle) || void 0 === _41 || _41.setAttribute("textBaseline", "bottom"));
         }
         if (isValid(align) || isValid(null == subtextStyle ? void 0 : subtextStyle.align)) {
-            const subTitleAlign = (null == subtextStyle ? void 0 : subtextStyle.align) ? null == subtextStyle ? void 0 : subtextStyle.align : align, subTitleWidth = null !== (_24 = null == subtextStyle ? void 0 : subtextStyle.width) && void 0 !== _24 ? _24 : subtextWidth;
-            "left" === subTitleAlign ? (null === (_25 = this._subTitle) || void 0 === _25 || _25.setAttribute("x", 0), 
-            null === (_26 = this._subTitle) || void 0 === _26 || _26.setAttribute("textAlign", "left")) : "center" === subTitleAlign ? (null === (_27 = this._subTitle) || void 0 === _27 || _27.setAttribute("x", subTitleWidth / 2), 
-            null === (_28 = this._subTitle) || void 0 === _28 || _28.setAttribute("textAlign", "center")) : "right" === subTitleAlign && (null === (_29 = this._subTitle) || void 0 === _29 || _29.setAttribute("x", subTitleWidth), 
-            null === (_30 = this._subTitle) || void 0 === _30 || _30.setAttribute("textAlign", "right"));
+            const subTitleAlign = (null == subtextStyle ? void 0 : subtextStyle.align) ? null == subtextStyle ? void 0 : subtextStyle.align : align, subTitleWidth = null !== (_42 = null == subtextStyle ? void 0 : subtextStyle.width) && void 0 !== _42 ? _42 : subtextWidth;
+            "left" === subTitleAlign ? (null === (_43 = this._subTitle) || void 0 === _43 || _43.setAttribute("x", 0), 
+            null === (_44 = this._subTitle) || void 0 === _44 || _44.setAttribute("textAlign", "left")) : "center" === subTitleAlign ? (null === (_45 = this._subTitle) || void 0 === _45 || _45.setAttribute("x", subTitleWidth / 2), 
+            null === (_46 = this._subTitle) || void 0 === _46 || _46.setAttribute("textAlign", "center")) : "right" === subTitleAlign && (null === (_47 = this._subTitle) || void 0 === _47 || _47.setAttribute("x", subTitleWidth), 
+            null === (_48 = this._subTitle) || void 0 === _48 || _48.setAttribute("textAlign", "right"));
         }
         if (isValid(verticalAlign) || isValid(null == textStyle ? void 0 : textStyle.verticalAlign)) {
-            const subTitleVerticalAlign = (null == subtextStyle ? void 0 : subtextStyle.verticalAlign) ? null == subtextStyle ? void 0 : subtextStyle.verticalAlign : verticalAlign, subTitleYStart = maintextHeight, subTitleHeight = null !== (_31 = null == subtextStyle ? void 0 : subtextStyle.height) && void 0 !== _31 ? _31 : 0;
-            "top" === subTitleVerticalAlign ? (null === (_32 = this._subTitle) || void 0 === _32 || _32.setAttribute("y", subTitleYStart), 
-            null === (_33 = this._subTitle) || void 0 === _33 || _33.setAttribute("textBaseline", "top")) : "middle" === subTitleVerticalAlign ? (null === (_34 = this._subTitle) || void 0 === _34 || _34.setAttribute("y", subTitleYStart + subTitleHeight / 2), 
-            null === (_35 = this._subTitle) || void 0 === _35 || _35.setAttribute("textBaseline", "middle")) : "bottom" === subTitleVerticalAlign && (null === (_36 = this._subTitle) || void 0 === _36 || _36.setAttribute("y", subTitleYStart + subTitleHeight), 
-            null === (_37 = this._subTitle) || void 0 === _37 || _37.setAttribute("textBaseline", "bottom"));
+            const subTitleVerticalAlign = (null == subtextStyle ? void 0 : subtextStyle.verticalAlign) ? null == subtextStyle ? void 0 : subtextStyle.verticalAlign : verticalAlign, subTitleYStart = maintextHeight, subTitleHeight = null !== (_49 = null == subtextStyle ? void 0 : subtextStyle.height) && void 0 !== _49 ? _49 : 0;
+            "top" === subTitleVerticalAlign ? (null === (_50 = this._subTitle) || void 0 === _50 || _50.setAttribute("y", subTitleYStart), 
+            null === (_51 = this._subTitle) || void 0 === _51 || _51.setAttribute("textBaseline", "top")) : "middle" === subTitleVerticalAlign ? (null === (_52 = this._subTitle) || void 0 === _52 || _52.setAttribute("y", subTitleYStart + subTitleHeight / 2), 
+            null === (_53 = this._subTitle) || void 0 === _53 || _53.setAttribute("textBaseline", "middle")) : "bottom" === subTitleVerticalAlign && (null === (_54 = this._subTitle) || void 0 === _54 || _54.setAttribute("y", subTitleYStart + subTitleHeight), 
+            null === (_55 = this._subTitle) || void 0 === _55 || _55.setAttribute("textBaseline", "bottom"));
         }
     }
 }