@visactor/vrender-components 0.16.14-alpha.8 → 0.16.15-alpha.0

package/dist/index.js

@@ -20982,8 +20982,8 @@
           this.name = 'tag';
       }
       render() {
-          var _a, _b, _c;
-          const { text = '', textStyle = {}, shape = {}, panel = {}, space = 4, minWidth, maxWidth, padding = 4, visible, state, type = 'text' } = this.attribute;
+          var _a;
+          const { text = '', textStyle = {}, shape = {}, panel = {}, space = 4, minWidth, maxWidth, padding = 4, visible, state } = this.attribute;
           const parsedPadding = vutils.normalizePadding(padding);
           const group = this.createOrUpdateChild('tag-content', { x: 0, y: 0, zIndex: 1 }, 'group');
           let symbol;
@@ -21005,100 +21005,75 @@
           }
           tagWidth += symbolPlaceWidth;
           textX += symbolPlaceWidth;
-          let textShape;
-          if (type === 'rich') {
-              const richTextAttrs = Object.assign(Object.assign({ textConfig: text, visible: vutils.isValid(text) && visible !== false }, textStyle), { x: textX, y: 0, width: (_a = textStyle.width) !== null && _a !== void 0 ? _a : 0, height: (_b = textStyle.height) !== null && _b !== void 0 ? _b : 0 });
-              textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext');
-              const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
-              if (visible && vutils.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');
-                  if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
-                      bgRect.states = state.panel;
-                  }
+          const textAttrs = Object.assign(Object.assign({ text, visible: vutils.isValid(text) && visible !== false, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }, textStyle), { x: textX, y: 0 });
+          if (vutils.isNil(textAttrs.lineHeight)) {
+              textAttrs.lineHeight = textAttrs.fontSize;
+          }
+          const textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text');
+          if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.text)) {
+              textShape.states = state.text;
+          }
+          const textBounds = measureTextSize(textAttrs.text, textStyle);
+          const textWidth = textBounds.width;
+          const textHeight = textBounds.height;
+          tagWidth += textWidth;
+          const size = (_a = shape.size) !== null && _a !== void 0 ? _a : 10;
+          const maxSize = vutils.isNumber(size) ? size : Math.max(size[0], size[1]);
+          tagHeight += Math.max(textHeight, (shape === null || shape === void 0 ? void 0 : shape.visible) ? maxSize : 0);
+          const { textAlign, textBaseline } = textStyle;
+          if (vutils.isValid(minWidth) || vutils.isValid(maxWidth)) {
+              if (vutils.isValid(minWidth) && tagWidth < minWidth) {
+                  tagWidth = minWidth;
+              }
+              if (vutils.isValid(maxWidth) && tagWidth > maxWidth) {
+                  tagWidth = maxWidth;
+                  textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);
+              }
+          }
+          let x = 0;
+          let y = 0;
+          if (textAlign === 'center') {
+              x -= tagWidth / 2;
+              if (symbol) {
+                  symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);
               }
+              group.setAttribute('x', -symbolPlaceWidth / 2);
           }
-          else if (type === 'html') {
-              const richTextAttrs = Object.assign(Object.assign({ textConfig: [], visible: vutils.isValid(text) && visible !== false, html: Object.assign({ dom: text, container: '', width: 30, height: 30, style: {} }, textStyle) }, textStyle), { x: textX, y: 0 });
-              textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext');
-              const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
-              if (visible && vutils.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');
-                  if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
-                      bgRect.states = state.panel;
-                  }
+          else if (textAlign === 'right' || textAlign === 'end') {
+              x -= tagWidth;
+              if (symbol) {
+                  symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);
               }
+              group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);
           }
-          else {
-              const textAttrs = Object.assign(Object.assign({ text: text, visible: vutils.isValid(text) && visible !== false, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }, textStyle), { x: textX, y: 0 });
-              if (vutils.isNil(textAttrs.lineHeight)) {
-                  textAttrs.lineHeight = textStyle.fontSize;
-              }
-              textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text');
-              if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.text)) {
-                  textShape.states = state.text;
-              }
-              const textBounds = measureTextSize(textAttrs.text, textStyle);
-              const textWidth = textBounds.width;
-              const textHeight = textBounds.height;
-              tagWidth += textWidth;
-              const size = (_c = shape.size) !== null && _c !== void 0 ? _c : 10;
-              const maxSize = vutils.isNumber(size) ? size : Math.max(size[0], size[1]);
-              tagHeight += Math.max(textHeight, (shape === null || shape === void 0 ? void 0 : shape.visible) ? maxSize : 0);
-              const { textAlign, textBaseline } = textStyle;
-              if (vutils.isValid(minWidth) || vutils.isValid(maxWidth)) {
-                  if (vutils.isValid(minWidth) && tagWidth < minWidth) {
-                      tagWidth = minWidth;
-                  }
-                  if (vutils.isValid(maxWidth) && tagWidth > maxWidth) {
-                      tagWidth = maxWidth;
-                      textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);
-                  }
-              }
-              let x = 0;
-              let y = 0;
-              if (textAlign === 'center') {
-                  x -= tagWidth / 2;
-                  if (symbol) {
-                      symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);
-                  }
-                  group.setAttribute('x', -symbolPlaceWidth / 2);
-              }
-              else if (textAlign === 'right' || textAlign === 'end') {
-                  x -= tagWidth;
-                  if (symbol) {
-                      symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);
-                  }
-                  group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);
-              }
-              else if (textAlign === 'left' || textAlign === 'start') {
-                  group.setAttribute('x', parsedPadding[3]);
-              }
-              if (textBaseline === 'middle') {
-                  y -= tagHeight / 2;
-                  if (symbol) {
-                      symbol.setAttribute('y', 0);
-                  }
+          else if (textAlign === 'left' || textAlign === 'start') {
+              group.setAttribute('x', parsedPadding[3]);
+          }
+          if (textBaseline === 'middle') {
+              y -= tagHeight / 2;
+              if (symbol) {
+                  symbol.setAttribute('y', 0);
               }
-              else if (textBaseline === 'bottom') {
-                  y -= tagHeight;
-                  if (symbol) {
-                      symbol.setAttribute('y', -textHeight / 2);
-                  }
-                  group.setAttribute('y', -parsedPadding[2]);
+          }
+          else if (textBaseline === 'bottom') {
+              y -= tagHeight;
+              if (symbol) {
+                  symbol.setAttribute('y', -textHeight / 2);
               }
-              else if (textBaseline === 'top') {
-                  group.setAttribute('y', parsedPadding[0]);
-                  if (symbol) {
-                      symbol.setAttribute('y', textHeight / 2);
-                  }
+              group.setAttribute('y', -parsedPadding[2]);
+          }
+          else if (textBaseline === 'top') {
+              group.setAttribute('y', parsedPadding[0]);
+              if (symbol) {
+                  symbol.setAttribute('y', textHeight / 2);
               }
-              const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
-              if (visible && vutils.isBoolean(bgVisible)) {
-                  const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, x,
-                      y, width: tagWidth, height: tagHeight }), 'rect');
-                  if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
-                      bgRect.states = state.panel;
-                  }
+          }
+          const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
+          if (visible && vutils.isBoolean(bgVisible)) {
+              const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, x,
+                  y, width: tagWidth, height: tagHeight }), 'rect');
+              if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
+                  bgRect.states = state.panel;
               }
           }
       }
@@ -21970,6 +21945,45 @@
       var _a, _b;
       return (_b = (_a = animationEffects[type]) === null || _a === void 0 ? void 0 : _a.call(animationEffects, textAttribute)) !== null && _b !== void 0 ? _b : { from: {}, to: {} };
   }
+  function updateAnimation(prev, next, animationConfig) {
+      if (!vutils.isArray(animationConfig)) {
+          const { duration, easing, increaseEffect = true } = animationConfig;
+          prev.animate().to(next.attribute, duration, easing);
+          increaseEffect && playIncreaseCount(prev, next, duration, easing);
+          return;
+      }
+      animationConfig.forEach((cfg, i) => {
+          const { duration, easing, increaseEffect = true, channel } = cfg;
+          const { from, to } = update(prev, next, channel, cfg.options);
+          if (!vutils.isEmpty(to)) {
+              prev.animate().to(to, duration, easing);
+          }
+          if ('text' in from && 'text' in to && increaseEffect) {
+              playIncreaseCount(prev, next, duration, easing);
+          }
+      });
+  }
+  const update = (prev, next, channel, options) => {
+      const from = Object.assign({}, prev.attribute);
+      const to = Object.assign({}, next.attribute);
+      vutils.array(options === null || options === void 0 ? void 0 : options.excludeChannels).forEach(key => {
+          delete to[key];
+      });
+      Object.keys(to).forEach(key => {
+          if (channel && !channel.includes(key)) {
+              delete to[key];
+          }
+      });
+      return { from, to };
+  };
+  function playIncreaseCount(prev, next, duration, easing) {
+      if (prev.attribute.text !== next.attribute.text &&
+          vutils.isValidNumber(Number(prev.attribute.text) * Number(next.attribute.text))) {
+          prev
+              .animate()
+              .play(new IncreaseCount({ text: prev.attribute.text }, { text: next.attribute.text }, duration, easing));
+      }
+  }
   const DefaultLabelAnimation = {
       mode: 'same-time',
       duration: 300,
@@ -22163,6 +22177,24 @@
       }
       return points;
   };
+  function labelingLineOrArea(textBounds, graphicBounds, position = 'end', offset = 0) {
+      if (!textBounds || !graphicBounds) {
+          return;
+      }
+      const { x1, x2 } = textBounds;
+      const width = Math.abs(x2 - x1);
+      const anchorX = graphicBounds.x1;
+      const anchorY = graphicBounds.y1;
+      let x = anchorX;
+      const y = anchorY;
+      if (position === 'end') {
+          x = anchorX + width / 2 + offset;
+      }
+      else if (position === 'start') {
+          x = anchorX - width / 2 - offset;
+      }
+      return { x, y };
+  }
 
   class LabelBase extends AbstractComponent {
       setBitmap(bitmap) {
@@ -22310,31 +22342,13 @@
           target.states = state;
       }
       _createLabelText(attributes) {
-          var _a, _b;
-          if (attributes.textType === 'rich') {
-              attributes.textConfig = attributes.text;
-              attributes.width = (_a = attributes.width) !== null && _a !== void 0 ? _a : 0;
-              attributes.height = (_b = attributes.height) !== null && _b !== void 0 ? _b : 0;
-              const text = createRichText(attributes);
-              this._bindEvent(text);
-              this._setStatesOfText(text);
-              return text;
-          }
-          else if (attributes.textType === 'html') {
-              attributes.textConfig = [];
-              attributes.html = Object.assign({ dom: attributes.text, container: '', width: 30, height: 30, style: {} }, attributes);
-              const text = createRichText(attributes);
-              this._bindEvent(text);
-              this._setStatesOfText(text);
-              return text;
-          }
           const text = createText(attributes);
           this._bindEvent(text);
           this._setStatesOfText(text);
           return text;
       }
       _prepare() {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e;
           const currentBaseMarks = [];
           let baseMarks;
           if (vutils.isFunction(this.attribute.getBaseMarks)) {
@@ -22351,7 +22365,7 @@
           (_a = this._idToGraphic) === null || _a === void 0 ? void 0 : _a.clear();
           (_b = this._idToPoint) === null || _b === void 0 ? void 0 : _b.clear();
           this._baseMarks = currentBaseMarks;
-          this._isCollectionBase = ((_c = currentBaseMarks === null || currentBaseMarks === void 0 ? void 0 : currentBaseMarks[0]) === null || _c === void 0 ? void 0 : _c.type) === 'line' || ((_d = currentBaseMarks === null || currentBaseMarks === void 0 ? void 0 : currentBaseMarks[0]) === null || _d === void 0 ? void 0 : _d.type) === 'area';
+          this._isCollectionBase = this.attribute.type === 'line-data';
           if (!currentBaseMarks || currentBaseMarks.length === 0) {
               return;
           }
@@ -22397,6 +22411,15 @@
                   }
               }
           }
+          if (this.attribute.animation !== false) {
+              this._animationConfig = {
+                  enter: vutils.merge({}, DefaultLabelAnimation, this.attribute.animation, (_c = this.attribute.animationEnter) !== null && _c !== void 0 ? _c : {}),
+                  exit: vutils.merge({}, DefaultLabelAnimation, this.attribute.animation, (_d = this.attribute.animationExit) !== null && _d !== void 0 ? _d : {}),
+                  update: vutils.isArray(this.attribute.animationUpdate)
+                      ? this.attribute.animationUpdate
+                      : vutils.merge({}, DefaultLabelAnimation, this.attribute.animation, (_e = this.attribute.animationUpdate) !== null && _e !== void 0 ? _e : {})
+              };
+          }
       }
       getRelatedGrphic(item) {
           return this._idToGraphic.get(item.id);
@@ -22544,17 +22567,11 @@
           }
       }
       _renderWithAnimation(labels) {
-          var _a, _b, _c, _d, _e;
-          const animationConfig = ((_a = this.attribute.animation) !== null && _a !== void 0 ? _a : {});
-          const mode = (_b = animationConfig.mode) !== null && _b !== void 0 ? _b : DefaultLabelAnimation.mode;
-          const duration = (_c = animationConfig.duration) !== null && _c !== void 0 ? _c : DefaultLabelAnimation.duration;
-          const easing = (_d = animationConfig.easing) !== null && _d !== void 0 ? _d : DefaultLabelAnimation.easing;
-          const delay = (_e = animationConfig.delay) !== null && _e !== void 0 ? _e : 0;
           const currentTextMap = new Map();
           const prevTextMap = this._graphicToText || new Map();
           const texts = [];
           labels.forEach((text, index) => {
-              var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+              var _a, _b, _c, _d, _e, _f, _g;
               const labelLine = this._labelLine(text);
               const relatedGraphic = this.getRelatedGrphic(text.attribute);
               const textId = text.attribute.id;
@@ -22573,13 +22590,7 @@
                       this._syncStateWithRelatedGraphic(relatedGraphic);
                       relatedGraphic.once('animate-bind', a => {
                           text.setAttributes(from);
-                          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, {
-                              mode,
-                              duration,
-                              easing,
-                              to,
-                              delay
-                          });
+                          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, to, this._animationConfig.enter);
                           relatedGraphic.on('afterAttributeUpdate', listener);
                       });
                   }
@@ -22589,25 +22600,19 @@
                   prevTextMap.delete(textKey);
                   currentTextMap.set(textKey, prevLabel);
                   const prevText = prevLabel.text;
-                  prevText.animate().to(text.attribute, duration, easing);
+                  const { duration, easing } = this._animationConfig.update;
+                  updateAnimation(prevText, text, this._animationConfig.update);
                   if (prevLabel.labelLine) {
                       prevLabel.labelLine.animate().to(vutils.merge({}, prevLabel.labelLine.attribute, {
                           visible: (_f = (_d = (((_b = (_a = text.attribute) === null || _a === void 0 ? void 0 : _a.line) === null || _b === void 0 ? void 0 : _b.visible) && ((_c = text.attribute) === null || _c === void 0 ? void 0 : _c.visible))) !== null && _d !== void 0 ? _d : (_e = text.attribute) === null || _e === void 0 ? void 0 : _e.visible) !== null && _f !== void 0 ? _f : true,
                           points: (_g = text.attribute) === null || _g === void 0 ? void 0 : _g.points
                       }), duration, easing);
                   }
-                  if (animationConfig.increaseEffect !== false &&
-                      ((_h = prevText.attribute) === null || _h === void 0 ? void 0 : _h.text) !== ((_j = text.attribute) === null || _j === void 0 ? void 0 : _j.text) &&
-                      vutils.isValidNumber(Number((_k = prevText.attribute) === null || _k === void 0 ? void 0 : _k.text) * Number((_l = text.attribute) === null || _l === void 0 ? void 0 : _l.text))) {
-                      prevText
-                          .animate()
-                          .play(new IncreaseCount({ text: (_m = prevText.attribute) === null || _m === void 0 ? void 0 : _m.text }, { text: (_o = text.attribute) === null || _o === void 0 ? void 0 : _o.text }, duration, easing));
-                  }
               }
           });
           prevTextMap.forEach(label => {
               var _a;
-              (_a = label.text) === null || _a === void 0 ? void 0 : _a.animate().to(getAnimationAttributes(label.text.attribute, 'fadeOut').to, duration, easing).onEnd(() => {
+              (_a = label.text) === null || _a === void 0 ? void 0 : _a.animate().to(getAnimationAttributes(label.text.attribute, 'fadeOut').to, this._animationConfig.exit.duration, this._animationConfig.exit.easing).onEnd(() => {
                   this.removeChild(label.text);
                   if (label === null || label === void 0 ? void 0 : label.labelLine) {
                       this.removeChild(label.labelLine);
@@ -22656,7 +22661,7 @@
               relatedGraphic.on('afterAttributeUpdate', this._handleRelatedGraphicSetState);
           }
       }
-      _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, { mode, duration, easing, to, delay }) {
+      _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, to, { mode, duration, easing, delay }) {
           const listener = (event) => {
               var _a, _b;
               const { detail } = event;
@@ -22674,7 +22679,7 @@
                   text.setAttributes(to);
                   return;
               }
-              const onEnd = () => {
+              const onStart = () => {
                   if (relatedGraphic) {
                       relatedGraphic.onAnimateBind = undefined;
                       relatedGraphic.removeEventListener('afterAttributeUpdate', listener);
@@ -22683,14 +22688,14 @@
               switch (mode) {
                   case 'after':
                       if (detail.animationState.end) {
-                          text.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                          text.animate({ onStart }).wait(delay).to(to, duration, easing);
                       }
                       break;
                   case 'after-all':
                       if (index === texts.length - 1) {
                           if (detail.animationState.end) {
                               texts.forEach(t => {
-                                  t.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                                  t.animate({ onStart }).wait(delay).to(to, duration, easing);
                               });
                           }
                       }
@@ -22701,12 +22706,12 @@
                           const point = this._idToPoint.get(text.attribute.id);
                           if (point &&
                               (!text.animates || !text.animates.has('label-animate')) &&
-                              this._baseMarks[0].containsPoint(point.x, point.y, IContainPointMode.LOCAL, (_b = this.stage) === null || _b === void 0 ? void 0 : _b.pickerService)) {
-                              text.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                              relatedGraphic.containsPoint(point.x, point.y, IContainPointMode.LOCAL, (_b = this.stage) === null || _b === void 0 ? void 0 : _b.pickerService)) {
+                              text.animate({ onStart }).wait(delay).to(to, duration, easing);
                           }
                       }
                       else if (detail.animationState.isFirstFrameOfStep) {
-                          text.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                          text.animate({ onStart }).wait(delay).to(to, duration, easing);
                       }
                       break;
               }
@@ -22940,22 +22945,7 @@
           };
       }
       labeling(textBounds, graphicBounds, position = 'end', offset = 0) {
-          if (!textBounds || !graphicBounds) {
-              return;
-          }
-          const { x1, x2 } = textBounds;
-          const width = Math.abs(x2 - x1);
-          const anchorX = graphicBounds.x1;
-          const anchorY = graphicBounds.y1;
-          let x = anchorX;
-          const y = anchorY;
-          if (position === 'end') {
-              x = anchorX + width / 2 + offset;
-          }
-          else if (position === 'start') {
-              x = anchorX - width / 2 - offset;
-          }
-          return { x, y };
+          return labelingLineOrArea(textBounds, graphicBounds, position, offset);
       }
   }
   LineLabel.defaultAttributes = {
@@ -23717,10 +23707,49 @@
       pickable: false
   };
 
+  class AreaLabel extends LabelBase {
+      constructor(attributes) {
+          super(vutils.merge({}, AreaLabel.defaultAttributes, attributes));
+          this.name = 'line-label';
+      }
+      getGraphicBounds(graphic, point = {}) {
+          var _a;
+          if (graphic.type !== 'area') {
+              return super.getGraphicBounds(graphic, point);
+          }
+          const { position = 'end' } = this.attribute;
+          const points = ((_a = graphic === null || graphic === void 0 ? void 0 : graphic.attribute) === null || _a === void 0 ? void 0 : _a.points) || [point];
+          const index = position === 'start' ? 0 : points.length - 1;
+          return {
+              x1: points[index].x,
+              x2: points[index].x,
+              y1: points[index].y,
+              y2: points[index].y
+          };
+      }
+      labeling(textBounds, graphicBounds, position = 'end', offset = 0) {
+          return labelingLineOrArea(textBounds, graphicBounds, position, offset);
+      }
+  }
+  AreaLabel.defaultAttributes = {
+      textStyle: {
+          fontSize: 12,
+          fill: '#000',
+          textAlign: 'center',
+          textBaseline: 'middle',
+          boundsPadding: [-1, 0, -1, 0]
+      },
+      position: 'end',
+      offset: 6,
+      pickable: false
+  };
+
   const labelComponentMap = {
       rect: RectLabel,
       symbol: SymbolLabel,
       arc: ArcLabel,
+      line: LineLabel,
+      area: AreaLabel,
       'line-data': LineDataLabel
   };
   class DataLabel extends AbstractComponent {
@@ -23729,6 +23758,7 @@
           this.name = 'data-label';
       }
       render() {
+          var _a;
           const { dataLabels, size } = this.attribute;
           if (!dataLabels || dataLabels.length === 0) {
               return;
@@ -23748,20 +23778,21 @@
               const dataLabel = dataLabels[i];
               const labelComponent = labelComponentMap[dataLabel.type] || LabelBase;
               if (labelComponent) {
-                  const { baseMarkGroupName } = dataLabel;
-                  let component = this._componentMap.get(baseMarkGroupName);
+                  const { baseMarkGroupName, type } = dataLabel;
+                  const id = (_a = dataLabel.id) !== null && _a !== void 0 ? _a : `${baseMarkGroupName}-${type}-${i}`;
+                  let component = this._componentMap.get(id);
                   if (component) {
                       component.setBitmapTool(tool);
                       component.setBitmap(bitmap);
                       component.setAttributes(dataLabel);
-                      currentComponentMap.set(baseMarkGroupName, component);
+                      currentComponentMap.set(id, component);
                   }
                   else {
                       component = new labelComponent(dataLabel);
                       component.setBitmap(bitmap);
                       component.setBitmapTool(tool);
                       this.add(component);
-                      currentComponentMap.set(baseMarkGroupName, component);
+                      currentComponentMap.set(id, component);
                   }
               }
           }
@@ -24273,26 +24304,12 @@
           let textAlign = 'center';
           let textBaseline = 'middle';
           data.forEach((item, index) => {
-              var _a, _b, _c, _d;
+              var _a, _b;
               const labelStyle = this._getLabelAttribute(item, index, data, layer);
-              let text;
-              if ((labelStyle === null || labelStyle === void 0 ? void 0 : labelStyle.type) === 'rich') {
-                  labelStyle.textConfig = labelStyle.text;
-                  labelStyle.width = (_a = labelStyle.width) !== null && _a !== void 0 ? _a : 0;
-                  labelStyle.height = (_b = labelStyle.height) !== null && _b !== void 0 ? _b : 0;
-                  text = createRichText(labelStyle);
-              }
-              else if ((labelStyle === null || labelStyle === void 0 ? void 0 : labelStyle.type) === 'html') {
-                  labelStyle.textConfig = [];
-                  labelStyle.html = Object.assign({ dom: labelStyle.text, container: '', width: 30, height: 30, style: {} }, labelStyle);
-                  text = createRichText(labelStyle);
-              }
-              else {
-                  text = createText(labelStyle);
-              }
+              const text = createText(labelStyle);
               text.name = exports.AXIS_ELEMENT_NAME.label;
               text.id = this._getNodeId(`layer${layer}-label-${item.id}`);
-              if (vutils.isEmpty((_c = this.attribute.label) === null || _c === void 0 ? void 0 : _c.state)) {
+              if (vutils.isEmpty((_a = this.attribute.label) === null || _a === void 0 ? void 0 : _a.state)) {
                   text.states = DEFAULT_STATES$2;
               }
               else {
@@ -24305,7 +24322,7 @@
                   text.states = labelState;
               }
               labelGroup.add(text);
-              const angle = (_d = labelStyle.angle) !== null && _d !== void 0 ? _d : 0;
+              const angle = (_b = labelStyle.angle) !== null && _b !== void 0 ? _b : 0;
               maxTextWidth = Math.max(maxTextWidth, text.AABBBounds.width());
               maxTextHeight = Math.max(maxTextHeight, text.AABBBounds.height());
               if (angle) {
@@ -24454,7 +24471,7 @@
       }
       _getLabelAttribute(tickDatum, index, tickData, layer) {
           var _a, _b, _c, _d, _e, _f;
-          const _g = this.attribute.label, { space = 4, inside = false, formatMethod, type = 'text', text } = _g, tagAttributes = __rest(_g, ["space", "inside", "formatMethod", "type", "text"]);
+          const _g = this.attribute.label, { space = 4, inside = false, formatMethod } = _g, tagAttributes = __rest(_g, ["space", "inside", "formatMethod"]);
           let offset = space;
           let tickLength = 0;
           if (((_a = this.attribute.tick) === null || _a === void 0 ? void 0 : _a.visible) && ((_b = this.attribute.tick) === null || _b === void 0 ? void 0 : _b.inside) === inside) {
@@ -24475,9 +24492,7 @@
           }
           const point = this.getVerticalCoord(tickDatum.point, offset, inside);
           const vector = this.getVerticalVector(offset, inside, point);
-          const textContent = formatMethod
-              ? formatMethod(`${tickDatum.label}`, tickDatum, index, tickData, layer)
-              : tickDatum.label;
+          const text = formatMethod ? formatMethod(`${tickDatum.label}`, tickDatum, index, tickData, layer) : tickDatum.label;
           let { style: textStyle } = tagAttributes;
           textStyle = vutils.isFunction(textStyle)
               ? vutils.merge({}, DEFAULT_AXIS_THEME.label.style, textStyle(tickDatum, index, tickData, layer))
@@ -24492,7 +24507,7 @@
                   layer
               });
           }
-          return Object.assign(Object.assign(Object.assign({}, this.getLabelPosition(point, vector, textContent, textStyle)), { text: text !== null && text !== void 0 ? text : textContent, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize, type }), textStyle);
+          return Object.assign(Object.assign(Object.assign({}, this.getLabelPosition(point, vector, text, textStyle)), { text, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }), textStyle);
       }
       getLabelPosition(point, vector, text, style) {
           return point;
@@ -25230,7 +25245,7 @@
           let titleSpacing = 0;
           const axisLineWidth = (line === null || line === void 0 ? void 0 : line.visible) ? (_b = line.style.lineWidth) !== null && _b !== void 0 ? _b : 1 : 0;
           const tickLength = (tick === null || tick === void 0 ? void 0 : tick.visible) ? (_c = tick.length) !== null && _c !== void 0 ? _c : 4 : 0;
-          if ((title === null || title === void 0 ? void 0 : title.visible) && typeof title.text === 'string') {
+          if (title === null || title === void 0 ? void 0 : title.visible) {
               titleHeight = measureTextSize(title.text, title.textStyle).height;
               const padding = vutils.normalizePadding(title.padding);
               titleSpacing = title.space + padding[0] + padding[2];
@@ -26025,13 +26040,6 @@
   }
   vutils.mixin(CircleAxisGrid, CircleAxisMixin);
 
-  var DataZoomActiveTag;
-  (function (DataZoomActiveTag) {
-      DataZoomActiveTag["startHandler"] = "startHandler";
-      DataZoomActiveTag["endHandler"] = "endHandler";
-      DataZoomActiveTag["middleHandler"] = "middleHandler";
-      DataZoomActiveTag["background"] = "background";
-  })(DataZoomActiveTag || (DataZoomActiveTag = {}));
   const DEFAULT_DATA_ZOOM_ATTRIBUTES = {
       orient: 'bottom',
       showDetail: 'auto',
@@ -26130,6 +26138,14 @@
       }
   };
 
+  exports.DataZoomActiveTag = void 0;
+  (function (DataZoomActiveTag) {
+      DataZoomActiveTag["startHandler"] = "startHandler";
+      DataZoomActiveTag["endHandler"] = "endHandler";
+      DataZoomActiveTag["middleHandler"] = "middleHandler";
+      DataZoomActiveTag["background"] = "background";
+  })(exports.DataZoomActiveTag || (exports.DataZoomActiveTag = {}));
+
   const delayMap$1 = {
       debounce: vutils.debounce,
       throttle: vutils.throttle
@@ -26157,23 +26173,23 @@
           this._onHandlerPointerDown = (e, tag) => {
               e.stopPropagation();
               if (tag === 'start') {
-                  this._activeTag = DataZoomActiveTag.startHandler;
+                  this._activeTag = exports.DataZoomActiveTag.startHandler;
                   this._activeItem = this._startHandler;
               }
               else if (tag === 'end') {
-                  this._activeTag = DataZoomActiveTag.endHandler;
+                  this._activeTag = exports.DataZoomActiveTag.endHandler;
                   this._activeItem = this._endHandler;
               }
               else if (tag === 'middleRect') {
-                  this._activeTag = DataZoomActiveTag.middleHandler;
+                  this._activeTag = exports.DataZoomActiveTag.middleHandler;
                   this._activeItem = this._middleHandlerRect;
               }
               else if (tag === 'middleSymbol') {
-                  this._activeTag = DataZoomActiveTag.middleHandler;
+                  this._activeTag = exports.DataZoomActiveTag.middleHandler;
                   this._activeItem = this._middleHandlerSymbol;
               }
               else if (tag === 'background') {
-                  this._activeTag = DataZoomActiveTag.background;
+                  this._activeTag = exports.DataZoomActiveTag.background;
                   this._activeItem = this._background;
               }
               this._activeState = true;
@@ -26181,6 +26197,7 @@
               this._activeCache.lastPos = this.eventPosToStagePos(e);
           };
           this._onHandlerPointerMove = (e) => {
+              var _a;
               e.stopPropagation();
               const { start: startAttr, end: endAttr, brushSelect, realTime = true } = this.attribute;
               const pos = this.eventPosToStagePos(e);
@@ -26188,24 +26205,24 @@
               const dis = (pos[attPos] - this._activeCache.lastPos[attPos]) / max;
               let { start, end } = this.state;
               if (this._activeState) {
-                  if (this._activeTag === DataZoomActiveTag.middleHandler) {
+                  if (this._activeTag === exports.DataZoomActiveTag.middleHandler) {
                       this.moveZoomWithMiddle((this.state.start + this.state.end) / 2 + dis);
                   }
-                  else if (this._activeTag === DataZoomActiveTag.startHandler) {
+                  else if (this._activeTag === exports.DataZoomActiveTag.startHandler) {
                       if (start + dis > end) {
                           start = end;
                           end = start + dis;
-                          this._activeTag = DataZoomActiveTag.endHandler;
+                          this._activeTag = exports.DataZoomActiveTag.endHandler;
                       }
                       else {
                           start = start + dis;
                       }
                   }
-                  else if (this._activeTag === DataZoomActiveTag.endHandler) {
+                  else if (this._activeTag === exports.DataZoomActiveTag.endHandler) {
                       if (end + dis < start) {
                           end = start;
                           start = end + dis;
-                          this._activeTag = DataZoomActiveTag.startHandler;
+                          this._activeTag = exports.DataZoomActiveTag.startHandler;
                       }
                       else {
                           end = end + dis;
@@ -26218,7 +26235,7 @@
               end = Math.min(Math.max(end, 0), 1);
               if (startAttr !== start || endAttr !== end) {
                   this.setStateAttr(start, end, true);
-                  realTime && this._updateStateCallback && this._updateStateCallback(start, end);
+                  realTime && ((_a = this._updateStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, start, end, this._activeTag));
                   this._dispatchChangeEvent(start, end);
               }
           };
@@ -26323,10 +26340,11 @@
           };
       }
       _onHandlerPointerUp(e) {
+          var _a;
           e.preventDefault();
           const { start, end, brushSelect, realTime = true } = this.attribute;
           if (this._activeState) {
-              if (this._activeTag === DataZoomActiveTag.background) {
+              if (this._activeTag === exports.DataZoomActiveTag.background) {
                   const pos = this.eventPosToStagePos(e);
                   this.backgroundDragZoom(this._activeCache.startPos, pos);
               }
@@ -26335,7 +26353,7 @@
           brushSelect && this.renderDragMask();
           if (!realTime || start !== this.state.start || end !== this.state.end) {
               this.setStateAttr(this.state.start, this.state.end, true);
-              this._updateStateCallback && this._updateStateCallback(this.state.start, this.state.end);
+              (_a = this._updateStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, this.state.start, this.state.end, this._activeTag);
               this._dispatchChangeEvent(this.state.start, this.state.end);
           }
       }
@@ -26385,11 +26403,11 @@
           const { dragMaskStyle } = this.attribute;
           const { position, width, height } = this.getLayoutAttrFromConfig();
           if (this._isHorizontal) {
-              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.x : this._activeCache.startPos.x, position.x, position.x + width), y: position.y, width: (this._activeState && this._activeTag === DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
+              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.x : this._activeCache.startPos.x, position.x, position.x + width), y: position.y, width: (this._activeState && this._activeTag === exports.DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
                       0, height }, dragMaskStyle), 'rect');
           }
           else {
-              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: position.x, y: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.y : this._activeCache.startPos.y, position.y, position.y + height), width, height: (this._activeState && this._activeTag === DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
+              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: position.x, y: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.y : this._activeCache.startPos.y, position.y, position.y + height), width, height: (this._activeState && this._activeTag === exports.DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
                       0 }, dragMaskStyle), 'rect');
           }
       }
@@ -26708,13 +26726,14 @@
           this.dispatchEvent(changeEvent);
       }
       setStartAndEnd(start, end) {
+          var _a;
           const { start: startAttr, end: endAttr } = this.attribute;
           if (vutils.isValid(start) && vutils.isValid(end) && (start !== this.state.start || end !== this.state.end)) {
               this.state.start = start;
               this.state.end = end;
               if (startAttr !== this.state.start || endAttr !== this.state.end) {
                   this.setStateAttr(start, end, true);
-                  this._updateStateCallback && this._updateStateCallback(start, end);
+                  (_a = this._updateStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, start, end, this._activeTag);
                   this._dispatchChangeEvent(start, end);
               }
           }
@@ -27801,51 +27820,23 @@
               const target = e.target;
               if ((_a = target === null || target === void 0 ? void 0 : target.name) === null || _a === void 0 ? void 0 : _a.startsWith(exports.LEGEND_ELEMENT_NAME.item)) {
                   const legendItem = target.delegate;
-                  const selected = legendItem.hasState(exports.LegendStateValue.selected);
-                  if (selected) {
-                      this._setLegendItemState(legendItem, exports.LegendStateValue.selectedHover, e);
-                  }
-                  else {
-                      this._setLegendItemState(legendItem, exports.LegendStateValue.unSelectedHover, e);
-                  }
-                  const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
-                  if (focusButton) {
-                      focusButton.setAttribute('visible', true);
+                  if (this._lastActiveItem) {
+                      if (this._lastActiveItem.id === legendItem.id) {
+                          return;
+                      }
+                      this._unHover(this._lastActiveItem, e);
                   }
-                  this._dispatchEvent(exports.LegendEvent.legendItemHover, legendItem, e);
+                  this._hover(legendItem, e);
+              }
+              else if (this._lastActiveItem) {
+                  this._unHover(this._lastActiveItem, e);
+                  this._lastActiveItem = null;
               }
           };
           this._onUnHover = (e) => {
-              var _a;
-              const target = e.target;
-              if ((_a = target === null || target === void 0 ? void 0 : target.name) === null || _a === void 0 ? void 0 : _a.startsWith(exports.LEGEND_ELEMENT_NAME.item)) {
-                  const legendItem = target.delegate;
-                  let attributeUpdate = false;
-                  if (legendItem.hasState(exports.LegendStateValue.unSelectedHover) ||
-                      legendItem.hasState(exports.LegendStateValue.selectedHover)) {
-                      attributeUpdate = true;
-                  }
-                  legendItem.removeState(exports.LegendStateValue.unSelectedHover);
-                  legendItem.removeState(exports.LegendStateValue.selectedHover);
-                  legendItem
-                      .getChildren()[0]
-                      .getChildren()
-                      .forEach((child) => {
-                      if (!attributeUpdate &&
-                          (child.hasState(exports.LegendStateValue.unSelectedHover) || child.hasState(exports.LegendStateValue.selectedHover))) {
-                          attributeUpdate = true;
-                      }
-                      child.removeState(exports.LegendStateValue.unSelectedHover);
-                      child.removeState(exports.LegendStateValue.selectedHover);
-                  });
-                  const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
-                  if (focusButton) {
-                      focusButton.setAttribute('visible', false);
-                  }
-                  if (attributeUpdate) {
-                      this._dispatchEvent(exports.LegendEvent.legendItemAttributeUpdate, legendItem, e);
-                  }
-                  this._dispatchEvent(exports.LegendEvent.legendItemUnHover, legendItem, e);
+              if (this._lastActiveItem) {
+                  this._unHover(this._lastActiveItem, e);
+                  this._lastActiveItem = null;
               }
           };
           this._onClick = (e) => {
@@ -28035,7 +28026,7 @@
           const { hover = true, select = true } = this.attribute;
           if (hover) {
               this._itemsContainer.addEventListener('pointermove', this._onHover);
-              this._itemsContainer.addEventListener('pointerout', this._onUnHover);
+              this._itemsContainer.addEventListener('pointerleave', this._onUnHover);
           }
           if (select) {
               this._itemsContainer.addEventListener('pointerdown', this._onClick);
@@ -28063,6 +28054,7 @@
               itemGroup = createGroup(Object.assign({ x: 0, y: 0 }, background === null || background === void 0 ? void 0 : background.style));
               this._appendDataToShape(itemGroup, exports.LEGEND_ELEMENT_NAME.item, item, itemGroup, background === null || background === void 0 ? void 0 : background.state);
           }
+          itemGroup.id = `${id !== null && id !== void 0 ? id : label}-${index}`;
           itemGroup.addState(isSelected ? exports.LegendStateValue.selected : exports.LegendStateValue.unSelected);
           const innerGroup = createGroup({
               x: 0,
@@ -28288,6 +28280,48 @@
           this._pager.addEventListener('toNext', onPaging);
           return true;
       }
+      _hover(legendItem, e) {
+          this._lastActiveItem = legendItem;
+          const selected = legendItem.hasState(exports.LegendStateValue.selected);
+          if (selected) {
+              this._setLegendItemState(legendItem, exports.LegendStateValue.selectedHover, e);
+          }
+          else {
+              this._setLegendItemState(legendItem, exports.LegendStateValue.unSelectedHover, e);
+          }
+          const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
+          if (focusButton) {
+              focusButton.setAttribute('visible', true);
+          }
+          this._dispatchEvent(exports.LegendEvent.legendItemHover, legendItem, e);
+      }
+      _unHover(legendItem, e) {
+          let attributeUpdate = false;
+          if (legendItem.hasState(exports.LegendStateValue.unSelectedHover) || legendItem.hasState(exports.LegendStateValue.selectedHover)) {
+              attributeUpdate = true;
+          }
+          legendItem.removeState(exports.LegendStateValue.unSelectedHover);
+          legendItem.removeState(exports.LegendStateValue.selectedHover);
+          legendItem
+              .getChildren()[0]
+              .getChildren()
+              .forEach((child) => {
+              if (!attributeUpdate &&
+                  (child.hasState(exports.LegendStateValue.unSelectedHover) || child.hasState(exports.LegendStateValue.selectedHover))) {
+                  attributeUpdate = true;
+              }
+              child.removeState(exports.LegendStateValue.unSelectedHover);
+              child.removeState(exports.LegendStateValue.selectedHover);
+          });
+          const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
+          if (focusButton) {
+              focusButton.setAttribute('visible', false);
+          }
+          if (attributeUpdate) {
+              this._dispatchEvent(exports.LegendEvent.legendItemAttributeUpdate, legendItem, e);
+          }
+          this._dispatchEvent(exports.LegendEvent.legendItemUnHover, legendItem, e);
+      }
       _setLegendItemState(legendItem, stateName, e) {
           const keepCurrentStates = true;
           let attributeUpdate = false;
@@ -29438,27 +29472,19 @@
           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, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69;
-          const { textType, text, subtextType, textStyle, subtext, subtextStyle, width, height, minWidth, maxWidth, minHeight, maxHeight, align, verticalAlign, padding = 0 } = this.attribute;
+          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, textStyle, subtext, subtextStyle, width, height, minWidth, maxWidth, minHeight, maxHeight, align, verticalAlign, padding = 0 } = this.attribute;
           const parsedPadding = vutils.normalizePadding(padding);
           const group = this.createOrUpdateChild('title-container', { x: parsedPadding[3], y: parsedPadding[0], zIndex: 1 }, 'group');
           if (((_a = this.attribute) === null || _a === void 0 ? void 0 : _a.visible) !== false && (textStyle === null || textStyle === void 0 ? void 0 : textStyle.visible) !== false) {
-              if (textType === 'rich') {
-                  const attr = Object.assign({ x: (_b = textStyle.x) !== null && _b !== void 0 ? _b : 0, y: (_c = textStyle.y) !== null && _c !== void 0 ? _c : 0, width: (_e = (_d = textStyle.width) !== null && _d !== void 0 ? _d : width) !== null && _e !== void 0 ? _e : 0, height: (_g = (_f = textStyle.height) !== null && _f !== void 0 ? _f : height) !== null && _g !== void 0 ? _g : 0, ellipsis: (_h = textStyle.ellipsis) !== null && _h !== void 0 ? _h : true, wordBreak: (_j = textStyle.wordBreak) !== null && _j !== void 0 ? _j : 'break-word', maxHeight: textStyle.maxHeight, maxWidth: textStyle.maxWidth, textConfig: text }, textStyle);
-                  this._mainTitle = group.createOrUpdateChild('mainTitle', attr, 'richtext');
-              }
-              else if (textType === 'html') {
-                  const attr = Object.assign({ html: Object.assign({ dom: text, container: '', width: 30, height: 30, style: '' }, textStyle), x: (_k = textStyle.x) !== null && _k !== void 0 ? _k : 0, y: (_l = textStyle.y) !== null && _l !== void 0 ? _l : 0, width: (_o = (_m = textStyle.width) !== null && _m !== void 0 ? _m : width) !== null && _o !== void 0 ? _o : 0, height: (_q = (_p = textStyle.height) !== null && _p !== void 0 ? _p : height) !== null && _q !== void 0 ? _q : 0, ellipsis: (_r = textStyle.ellipsis) !== null && _r !== void 0 ? _r : true, wordBreak: (_s = textStyle.wordBreak) !== null && _s !== void 0 ? _s : 'break-word', maxHeight: textStyle.maxHeight, maxWidth: textStyle.maxWidth, textConfig: [] }, textStyle);
-                  this._mainTitle = group.createOrUpdateChild('mainTitle', attr, 'richtext');
-              }
-              else if (textStyle && vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.character)) {
+              if (textStyle && vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.character)) {
                   const attr = {
-                      x: (_t = textStyle.x) !== null && _t !== void 0 ? _t : 0,
-                      y: (_u = textStyle.y) !== null && _u !== void 0 ? _u : 0,
-                      width: (_w = (_v = textStyle.width) !== null && _v !== void 0 ? _v : width) !== null && _w !== void 0 ? _w : 0,
-                      height: (_y = (_x = textStyle.height) !== null && _x !== void 0 ? _x : height) !== null && _y !== void 0 ? _y : 0,
-                      ellipsis: (_z = textStyle.ellipsis) !== null && _z !== void 0 ? _z : true,
-                      wordBreak: (_0 = textStyle.wordBreak) !== null && _0 !== void 0 ? _0 : 'break-word',
+                      x: (_b = textStyle.x) !== null && _b !== void 0 ? _b : 0,
+                      y: (_c = textStyle.y) !== null && _c !== void 0 ? _c : 0,
+                      width: (_e = (_d = textStyle.width) !== null && _d !== void 0 ? _d : width) !== null && _e !== void 0 ? _e : 0,
+                      height: (_g = (_f = textStyle.height) !== null && _f !== void 0 ? _f : height) !== null && _g !== void 0 ? _g : 0,
+                      ellipsis: (_h = textStyle.ellipsis) !== null && _h !== void 0 ? _h : true,
+                      wordBreak: (_j = textStyle.wordBreak) !== null && _j !== void 0 ? _j : 'break-word',
                       maxHeight: textStyle.maxHeight,
                       maxWidth: textStyle.maxWidth,
                       textConfig: textStyle.character
@@ -29466,28 +29492,20 @@
                   this._mainTitle = group.createOrUpdateChild('mainTitle', attr, 'richtext');
               }
               else if (vutils.isValid(text)) {
-                  this._mainTitle = group.createOrUpdateChild('mainTitle', Object.assign(Object.assign({ text: [text] }, textStyle), { maxLineWidth: (_1 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.maxLineWidth) !== null && _1 !== void 0 ? _1 : width, heightLimit: textStyle === null || textStyle === void 0 ? void 0 : textStyle.heightLimit, lineClamp: textStyle === null || textStyle === void 0 ? void 0 : textStyle.lineClamp, ellipsis: (_2 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.ellipsis) !== null && _2 !== void 0 ? _2 : true, x: 0, y: 0 }), 'wrapText');
+                  this._mainTitle = group.createOrUpdateChild('mainTitle', Object.assign(Object.assign({ text: [text] }, textStyle), { maxLineWidth: (_k = textStyle === null || textStyle === void 0 ? void 0 : textStyle.maxLineWidth) !== null && _k !== void 0 ? _k : width, heightLimit: textStyle === null || textStyle === void 0 ? void 0 : textStyle.heightLimit, lineClamp: textStyle === null || textStyle === void 0 ? void 0 : textStyle.lineClamp, ellipsis: (_l = textStyle === null || textStyle === void 0 ? void 0 : textStyle.ellipsis) !== null && _l !== void 0 ? _l : true, x: 0, y: 0 }), 'wrapText');
               }
           }
-          const maintextHeight = this._mainTitle ? (_3 = this._mainTitle) === null || _3 === void 0 ? void 0 : _3.AABBBounds.height() : 0;
-          const maintextWidth = this._mainTitle ? (_4 = this._mainTitle) === null || _4 === void 0 ? void 0 : _4.AABBBounds.width() : 0;
-          if (((_5 = this.attribute) === null || _5 === void 0 ? void 0 : _5.visible) !== false && (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.visible) !== false) {
-              if (subtextType === 'rich') {
-                  const attr = Object.assign({ x: (_6 = subtextStyle.x) !== null && _6 !== void 0 ? _6 : 0, y: (_7 = subtextStyle.y) !== null && _7 !== void 0 ? _7 : 0, width: (_9 = (_8 = subtextStyle.width) !== null && _8 !== void 0 ? _8 : width) !== null && _9 !== void 0 ? _9 : 0, height: (_11 = (_10 = subtextStyle.height) !== null && _10 !== void 0 ? _10 : height) !== null && _11 !== void 0 ? _11 : 0, ellipsis: (_12 = subtextStyle.ellipsis) !== null && _12 !== void 0 ? _12 : true, wordBreak: (_13 = subtextStyle.wordBreak) !== null && _13 !== void 0 ? _13 : 'break-word', maxHeight: subtextStyle.maxHeight, maxWidth: subtextStyle.maxWidth, textConfig: subtext }, subtextStyle);
-                  this._subTitle = group.createOrUpdateChild('subTitle', attr, 'richtext');
-              }
-              else if (textType === 'html') {
-                  const attr = Object.assign({ html: Object.assign({ dom: subtext, container: '', width: 30, height: 30, style: {} }, subtextStyle), x: (_14 = subtextStyle.x) !== null && _14 !== void 0 ? _14 : 0, y: (_15 = subtextStyle.y) !== null && _15 !== void 0 ? _15 : 0, width: (_17 = (_16 = subtextStyle.width) !== null && _16 !== void 0 ? _16 : width) !== null && _17 !== void 0 ? _17 : 0, height: (_19 = (_18 = subtextStyle.height) !== null && _18 !== void 0 ? _18 : height) !== null && _19 !== void 0 ? _19 : 0, ellipsis: (_20 = subtextStyle.ellipsis) !== null && _20 !== void 0 ? _20 : true, wordBreak: (_21 = subtextStyle.wordBreak) !== null && _21 !== void 0 ? _21 : 'break-word', maxHeight: subtextStyle.maxHeight, maxWidth: subtextStyle.maxWidth, textConfig: [] }, subtextStyle);
-                  this._subTitle = group.createOrUpdateChild('subTitle', attr, 'richtext');
-              }
-              else if (subtextStyle && vutils.isValid(subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.character)) {
+          const maintextHeight = this._mainTitle ? (_m = this._mainTitle) === null || _m === void 0 ? void 0 : _m.AABBBounds.height() : 0;
+          const maintextWidth = this._mainTitle ? (_o = this._mainTitle) === null || _o === void 0 ? void 0 : _o.AABBBounds.width() : 0;
+          if (((_p = this.attribute) === null || _p === void 0 ? void 0 : _p.visible) !== false && (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.visible) !== false) {
+              if (subtextStyle && vutils.isValid(subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.character)) {
                   const attr = {
-                      x: (_22 = subtextStyle.x) !== null && _22 !== void 0 ? _22 : 0,
-                      y: (_23 = subtextStyle.y) !== null && _23 !== void 0 ? _23 : maintextHeight,
-                      width: (_25 = (_24 = subtextStyle.width) !== null && _24 !== void 0 ? _24 : width) !== null && _25 !== void 0 ? _25 : 0,
-                      height: (_27 = (_26 = subtextStyle.height) !== null && _26 !== void 0 ? _26 : height) !== null && _27 !== void 0 ? _27 : 0,
-                      ellipsis: (_28 = subtextStyle.ellipsis) !== null && _28 !== void 0 ? _28 : true,
-                      wordBreak: (_29 = subtextStyle.wordBreak) !== null && _29 !== void 0 ? _29 : 'break-word',
+                      x: (_q = subtextStyle.x) !== null && _q !== void 0 ? _q : 0,
+                      y: (_r = subtextStyle.y) !== null && _r !== void 0 ? _r : maintextHeight,
+                      width: (_t = (_s = subtextStyle.width) !== null && _s !== void 0 ? _s : width) !== null && _t !== void 0 ? _t : 0,
+                      height: (_v = (_u = subtextStyle.height) !== null && _u !== void 0 ? _u : height) !== null && _v !== void 0 ? _v : 0,
+                      ellipsis: (_w = subtextStyle.ellipsis) !== null && _w !== void 0 ? _w : true,
+                      wordBreak: (_x = subtextStyle.wordBreak) !== null && _x !== void 0 ? _x : 'break-word',
                       maxHeight: subtextStyle.maxHeight,
                       maxWidth: subtextStyle.maxWidth,
                       textConfig: subtextStyle.character
@@ -29495,17 +29513,17 @@
                   this._subTitle = group.createOrUpdateChild('subTitle', attr, 'richtext');
               }
               else if (vutils.isValid(subtext)) {
-                  this._subTitle = group.createOrUpdateChild('subTitle', Object.assign(Object.assign({ text: [subtext] }, subtextStyle), { maxLineWidth: (_30 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.maxLineWidth) !== null && _30 !== void 0 ? _30 : width, heightLimit: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.heightLimit, lineClamp: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.lineClamp, ellipsis: (_31 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.ellipsis) !== null && _31 !== void 0 ? _31 : true, x: 0, y: maintextHeight }), 'wrapText');
+                  this._subTitle = group.createOrUpdateChild('subTitle', Object.assign(Object.assign({ text: [subtext] }, subtextStyle), { maxLineWidth: (_y = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.maxLineWidth) !== null && _y !== void 0 ? _y : width, heightLimit: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.heightLimit, lineClamp: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.lineClamp, ellipsis: (_z = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.ellipsis) !== null && _z !== void 0 ? _z : true, x: 0, y: maintextHeight }), 'wrapText');
               }
           }
-          const subtextHeight = this._subTitle ? (_32 = this._subTitle) === null || _32 === void 0 ? void 0 : _32.AABBBounds.height() : 0;
-          const subtextWidth = this._subTitle ? (_33 = this._subTitle) === null || _33 === void 0 ? void 0 : _33.AABBBounds.width() : 0;
+          const subtextHeight = this._subTitle ? (_0 = this._subTitle) === null || _0 === void 0 ? void 0 : _0.AABBBounds.height() : 0;
+          const subtextWidth = this._subTitle ? (_1 = this._subTitle) === null || _1 === void 0 ? void 0 : _1.AABBBounds.width() : 0;
           let titleWidth = Math.max(maintextWidth, subtextWidth);
-          let titleHeight = maintextHeight + ((_34 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _34 !== void 0 ? _34 : subtextHeight);
+          let titleHeight = maintextHeight + ((_2 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _2 !== void 0 ? _2 : subtextHeight);
           if (vutils.isValid(width)) {
               titleWidth = width;
-              (_35 = this._mainTitle) === null || _35 === void 0 ? void 0 : _35.setAttribute('maxLineWidth', width);
-              (_36 = this._subTitle) === null || _36 === void 0 ? void 0 : _36.setAttribute('maxLineWidth', width);
+              (_3 = this._mainTitle) === null || _3 === void 0 ? void 0 : _3.setAttribute('maxLineWidth', width);
+              (_4 = this._subTitle) === null || _4 === void 0 ? void 0 : _4.setAttribute('maxLineWidth', width);
           }
           if (vutils.isValid(height)) {
               titleHeight = height;
@@ -29514,10 +29532,10 @@
               titleWidth = minWidth;
           }
           if (vutils.isValid(maxWidth)) {
-              (_37 = this._mainTitle) === null || _37 === void 0 ? void 0 : _37.setAttribute('maxLineWidth', maxWidth);
-              (_38 = this._subTitle) === null || _38 === void 0 ? void 0 : _38.setAttribute('maxLineWidth', maxWidth);
-              (_39 = this._mainTitle) === null || _39 === void 0 ? void 0 : _39.setAttribute('maxWidth', maxWidth);
-              (_40 = this._subTitle) === null || _40 === void 0 ? void 0 : _40.setAttribute('maxWidth', maxWidth);
+              (_5 = this._mainTitle) === null || _5 === void 0 ? void 0 : _5.setAttribute('maxLineWidth', maxWidth);
+              (_6 = this._subTitle) === null || _6 === void 0 ? void 0 : _6.setAttribute('maxLineWidth', maxWidth);
+              (_7 = this._mainTitle) === null || _7 === void 0 ? void 0 : _7.setAttribute('maxWidth', maxWidth);
+              (_8 = this._subTitle) === null || _8 === void 0 ? void 0 : _8.setAttribute('maxWidth', maxWidth);
               if (titleWidth > maxWidth) {
                   titleWidth = maxWidth;
               }
@@ -29526,8 +29544,8 @@
               titleHeight = minHeight;
           }
           if (vutils.isValid(maxHeight)) {
-              (_41 = this._mainTitle) === null || _41 === void 0 ? void 0 : _41.setAttribute('maxHeight', maxHeight);
-              (_42 = this._subTitle) === null || _42 === void 0 ? void 0 : _42.setAttribute('maxHeight', maxHeight - maintextHeight);
+              (_9 = this._mainTitle) === null || _9 === void 0 ? void 0 : _9.setAttribute('maxHeight', maxHeight);
+              (_10 = this._subTitle) === null || _10 === void 0 ? void 0 : _10.setAttribute('maxHeight', maxHeight - maintextHeight);
               if (titleHeight > maxHeight) {
                   titleHeight = maxHeight;
               }
@@ -29537,67 +29555,67 @@
           group.attribute.boundsPadding = parsedPadding;
           if (vutils.isValid(align) || vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.align)) {
               const mainTitleAlign = (textStyle === null || textStyle === void 0 ? void 0 : textStyle.align) ? textStyle === null || textStyle === void 0 ? void 0 : textStyle.align : align;
-              const mainTitleWidth = (_43 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.width) !== null && _43 !== void 0 ? _43 : maintextWidth;
+              const mainTitleWidth = (_11 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.width) !== null && _11 !== void 0 ? _11 : maintextWidth;
               if (mainTitleAlign === 'left') {
-                  (_44 = this._mainTitle) === null || _44 === void 0 ? void 0 : _44.setAttribute('x', 0);
-                  (_45 = this._mainTitle) === null || _45 === void 0 ? void 0 : _45.setAttribute('textAlign', 'left');
+                  (_12 = this._mainTitle) === null || _12 === void 0 ? void 0 : _12.setAttribute('x', 0);
+                  (_13 = this._mainTitle) === null || _13 === void 0 ? void 0 : _13.setAttribute('textAlign', 'left');
               }
               else if (mainTitleAlign === 'center') {
-                  (_46 = this._mainTitle) === null || _46 === void 0 ? void 0 : _46.setAttribute('x', mainTitleWidth / 2);
-                  (_47 = this._mainTitle) === null || _47 === void 0 ? void 0 : _47.setAttribute('textAlign', 'center');
+                  (_14 = this._mainTitle) === null || _14 === void 0 ? void 0 : _14.setAttribute('x', mainTitleWidth / 2);
+                  (_15 = this._mainTitle) === null || _15 === void 0 ? void 0 : _15.setAttribute('textAlign', 'center');
               }
               else if (mainTitleAlign === 'right') {
-                  (_48 = this._mainTitle) === null || _48 === void 0 ? void 0 : _48.setAttribute('x', mainTitleWidth);
-                  (_49 = this._mainTitle) === null || _49 === void 0 ? void 0 : _49.setAttribute('textAlign', 'right');
+                  (_16 = this._mainTitle) === null || _16 === void 0 ? void 0 : _16.setAttribute('x', mainTitleWidth);
+                  (_17 = this._mainTitle) === null || _17 === void 0 ? void 0 : _17.setAttribute('textAlign', 'right');
               }
           }
           if (vutils.isValid(verticalAlign) || vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign)) {
               const mainTitleVerticalAlign = (textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign) ? textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign : verticalAlign;
               const mainTitleHeight = (textStyle === null || textStyle === void 0 ? void 0 : textStyle.height) ? textStyle === null || textStyle === void 0 ? void 0 : textStyle.height : titleHeight;
               if (mainTitleVerticalAlign === 'top') {
-                  (_50 = this._mainTitle) === null || _50 === void 0 ? void 0 : _50.setAttribute('y', 0);
-                  (_51 = this._mainTitle) === null || _51 === void 0 ? void 0 : _51.setAttribute('textBaseline', 'top');
+                  (_18 = this._mainTitle) === null || _18 === void 0 ? void 0 : _18.setAttribute('y', 0);
+                  (_19 = this._mainTitle) === null || _19 === void 0 ? void 0 : _19.setAttribute('textBaseline', 'top');
               }
               else if (mainTitleVerticalAlign === 'middle') {
-                  (_52 = this._mainTitle) === null || _52 === void 0 ? void 0 : _52.setAttribute('y', mainTitleHeight / 2);
-                  (_53 = this._mainTitle) === null || _53 === void 0 ? void 0 : _53.setAttribute('textBaseline', 'middle');
+                  (_20 = this._mainTitle) === null || _20 === void 0 ? void 0 : _20.setAttribute('y', mainTitleHeight / 2);
+                  (_21 = this._mainTitle) === null || _21 === void 0 ? void 0 : _21.setAttribute('textBaseline', 'middle');
               }
               else if (mainTitleVerticalAlign === 'bottom') {
-                  (_54 = this._mainTitle) === null || _54 === void 0 ? void 0 : _54.setAttribute('y', mainTitleHeight);
-                  (_55 = this._mainTitle) === null || _55 === void 0 ? void 0 : _55.setAttribute('textBaseline', 'bottom');
+                  (_22 = this._mainTitle) === null || _22 === void 0 ? void 0 : _22.setAttribute('y', mainTitleHeight);
+                  (_23 = this._mainTitle) === null || _23 === void 0 ? void 0 : _23.setAttribute('textBaseline', 'bottom');
               }
           }
           if (vutils.isValid(align) || vutils.isValid(subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.align)) {
               const subTitleAlign = (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.align) ? subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.align : align;
-              const subTitleWidth = (_56 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.width) !== null && _56 !== void 0 ? _56 : subtextWidth;
+              const subTitleWidth = (_24 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.width) !== null && _24 !== void 0 ? _24 : subtextWidth;
               if (subTitleAlign === 'left') {
-                  (_57 = this._subTitle) === null || _57 === void 0 ? void 0 : _57.setAttribute('x', 0);
-                  (_58 = this._subTitle) === null || _58 === void 0 ? void 0 : _58.setAttribute('textAlign', 'left');
+                  (_25 = this._subTitle) === null || _25 === void 0 ? void 0 : _25.setAttribute('x', 0);
+                  (_26 = this._subTitle) === null || _26 === void 0 ? void 0 : _26.setAttribute('textAlign', 'left');
               }
               else if (subTitleAlign === 'center') {
-                  (_59 = this._subTitle) === null || _59 === void 0 ? void 0 : _59.setAttribute('x', subTitleWidth / 2);
-                  (_60 = this._subTitle) === null || _60 === void 0 ? void 0 : _60.setAttribute('textAlign', 'center');
+                  (_27 = this._subTitle) === null || _27 === void 0 ? void 0 : _27.setAttribute('x', subTitleWidth / 2);
+                  (_28 = this._subTitle) === null || _28 === void 0 ? void 0 : _28.setAttribute('textAlign', 'center');
               }
               else if (subTitleAlign === 'right') {
-                  (_61 = this._subTitle) === null || _61 === void 0 ? void 0 : _61.setAttribute('x', subTitleWidth);
-                  (_62 = this._subTitle) === null || _62 === void 0 ? void 0 : _62.setAttribute('textAlign', 'right');
+                  (_29 = this._subTitle) === null || _29 === void 0 ? void 0 : _29.setAttribute('x', subTitleWidth);
+                  (_30 = this._subTitle) === null || _30 === void 0 ? void 0 : _30.setAttribute('textAlign', 'right');
               }
           }
           if (vutils.isValid(verticalAlign) || vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign)) {
               const subTitleVerticalAlign = (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.verticalAlign) ? subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.verticalAlign : verticalAlign;
               const subTitleYStart = maintextHeight;
-              const subTitleHeight = (_63 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _63 !== void 0 ? _63 : 0;
+              const subTitleHeight = (_31 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _31 !== void 0 ? _31 : 0;
               if (subTitleVerticalAlign === 'top') {
-                  (_64 = this._subTitle) === null || _64 === void 0 ? void 0 : _64.setAttribute('y', subTitleYStart);
-                  (_65 = this._subTitle) === null || _65 === void 0 ? void 0 : _65.setAttribute('textBaseline', 'top');
+                  (_32 = this._subTitle) === null || _32 === void 0 ? void 0 : _32.setAttribute('y', subTitleYStart);
+                  (_33 = this._subTitle) === null || _33 === void 0 ? void 0 : _33.setAttribute('textBaseline', 'top');
               }
               else if (subTitleVerticalAlign === 'middle') {
-                  (_66 = this._subTitle) === null || _66 === void 0 ? void 0 : _66.setAttribute('y', subTitleYStart + subTitleHeight / 2);
-                  (_67 = this._subTitle) === null || _67 === void 0 ? void 0 : _67.setAttribute('textBaseline', 'middle');
+                  (_34 = this._subTitle) === null || _34 === void 0 ? void 0 : _34.setAttribute('y', subTitleYStart + subTitleHeight / 2);
+                  (_35 = this._subTitle) === null || _35 === void 0 ? void 0 : _35.setAttribute('textBaseline', 'middle');
               }
               else if (subTitleVerticalAlign === 'bottom') {
-                  (_68 = this._subTitle) === null || _68 === void 0 ? void 0 : _68.setAttribute('y', subTitleYStart + subTitleHeight);
-                  (_69 = this._subTitle) === null || _69 === void 0 ? void 0 : _69.setAttribute('textBaseline', 'bottom');
+                  (_36 = this._subTitle) === null || _36 === void 0 ? void 0 : _36.setAttribute('y', subTitleYStart + subTitleHeight);
+                  (_37 = this._subTitle) === null || _37 === void 0 ? void 0 : _37.setAttribute('textBaseline', 'bottom');
               }
           }
       }
@@ -29652,7 +29670,7 @@
           this.name = 'indicator';
       }
       render() {
-          var _a, _b, _c;
+          var _a;
           const { visible, title, content, size, limitRatio = Infinity } = this.attribute;
           const limit = Math.min(size.width, size.height) * limitRatio;
           const group = this.createOrUpdateChild('indicator-container', { x: 0, y: 0, zIndex: 1 }, 'group');
@@ -29663,15 +29681,7 @@
           if (vutils.isValid(title)) {
               if (title.visible !== false) {
                   const titleStyle = vutils.merge({}, vutils.get(DEFAULT_INDICATOR_THEME, 'title.style'), title.style);
-                  if (titleStyle.type === 'rich') {
-                      this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({ textConfig: titleStyle.text }, titleStyle), { visible: title.visible, x: 0, y: 0, width: (_a = titleStyle.width) !== null && _a !== void 0 ? _a : 0, height: (_b = titleStyle.height) !== null && _b !== void 0 ? _b : 0 }), 'richtext');
-                  }
-                  else if (titleStyle.type === 'html') {
-                      this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({ textConfig: [], html: Object.assign({ dom: titleStyle.text, container: '', width: 30, height: 30, style: {} }, titleStyle) }, titleStyle), { visible: title.visible, x: 0, y: 0 }), 'richtext');
-                  }
-                  else {
-                      this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({}, titleStyle), { lineHeight: vutils.isValid(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize, visible: title.visible, x: 0, y: 0 }), 'text');
-                  }
+                  this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({}, titleStyle), { lineHeight: vutils.isValid(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize, visible: title.visible, x: 0, y: 0 }), 'text');
                   if (title.autoFit && vutils.isValidNumber(limit)) {
                       this._setAutoFit(limit, this._title, title);
                   }
@@ -29692,19 +29702,9 @@
               const contentComponents = [];
               let lastContentHeight = 0;
               contents.forEach((contentItem, i) => {
-                  var _a, _b;
                   if (contentItem.visible !== false) {
                       const contentStyle = vutils.merge({}, vutils.get(DEFAULT_INDICATOR_THEME, 'content.style'), contentItem.style);
-                      let contentComponent;
-                      if (contentStyle.type === 'rich') {
-                          contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({ textConfig: contentStyle.text }, contentStyle), { visible: title.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight, width: (_a = contentStyle.width) !== null && _a !== void 0 ? _a : 0, height: (_b = contentStyle.height) !== null && _b !== void 0 ? _b : 0 }), 'richtext');
-                      }
-                      else if (contentStyle.type === 'html') {
-                          contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({ textConfig: [], html: Object.assign({ dom: contentStyle.text, container: '', width: 30, height: 30, style: {} }, contentStyle) }, contentStyle), { visible: title.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight }), 'richtext');
-                      }
-                      else {
-                          contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({}, contentStyle), { lineHeight: vutils.isValid(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize, visible: contentItem.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight }), 'text');
-                      }
+                      const contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({}, contentStyle), { lineHeight: vutils.isValid(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize, visible: contentItem.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight }), 'text');
                       if (contentItem.autoFit && vutils.isValidNumber(limit)) {
                           this._setAutoFit(limit, contentComponent, contentItem);
                       }
@@ -29722,7 +29722,7 @@
               });
               this._content = contentComponents;
           }
-          const totalHeight = (_c = group === null || group === void 0 ? void 0 : group.AABBBounds.height()) !== null && _c !== void 0 ? _c : 0;
+          const totalHeight = (_a = group === null || group === void 0 ? void 0 : group.AABBBounds.height()) !== null && _a !== void 0 ? _a : 0;
           group.setAttribute('y', size.height / 2 - totalHeight / 2);
           group.setAttribute('x', size.width / 2);
       }
@@ -31081,13 +31081,7 @@
           this._tooltipTitleSymbol = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_SHAPE_NAME_SUFFIX}`, vutils.merge({ symbolType: 'circle' }, titleAttr.shape, {
               visible: isVisible(titleAttr) && isVisible(titleAttr.shape)
           }), 'symbol');
-          if (titleAttr.value.type === 'rich') {
-              this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ visible: isVisible(titleAttr) && isVisible(titleAttr.value), width: titleAttr.value.width, height: titleAttr.value.height, wordBreak: titleAttr.value.wordBreak, textAlign: titleAttr.value.textAlign, textBaseline: titleAttr.value.textBaseline, singleLine: false, textConfig: titleAttr.value.text }, titleAttr.value), 'richtext');
-          }
-          else if (titleAttr.value.type === 'html') {
-              this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ html: Object.assign({ dom: titleAttr.value.text, container: '', width: 30, height: 30, style: {} }, titleAttr.value), visible: isVisible(titleAttr) && isVisible(titleAttr.value), width: titleAttr.value.width, height: titleAttr.value.height, wordBreak: titleAttr.value.wordBreak, textAlign: titleAttr.value.textAlign, textBaseline: titleAttr.value.textBaseline, singleLine: false, textConfig: [] }, titleAttr.value), 'richtext');
-          }
-          else if (titleAttr.value.multiLine) {
+          if (titleAttr.value.multiLine) {
               this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ visible: isVisible(titleAttr) && isVisible(titleAttr.value) }, getRichTextAttribute(titleAttr.value)), 'richtext');
           }
           else {
@@ -31515,7 +31509,7 @@
       }
   };
 
-  const version = "0.16.14-alpha.8";
+  const version = "0.16.15-alpha.0";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;