tvcharts 0.7.40 → 0.7.42

package/dist/echarts.js

@@ -8459,13 +8459,13 @@ function parseRichText(text, style) {
       for (let j = 0; j < line2.tokens.length; j++) {
         const token = line2.tokens[j];
         const tokenStyle = token.styleName && style.rich[token.styleName] || {};
-        const textPadding = token.textPadding = tokenStyle.padding;
-        const paddingH = textPadding ? textPadding[1] + textPadding[3] : 0;
+        const textPadding2 = token.textPadding = tokenStyle.padding;
+        const paddingH = textPadding2 ? textPadding2[1] + textPadding2[3] : 0;
         const font = token.font = tokenStyle.font || style.font;
         token.contentHeight = getLineHeight(font);
         let tokenHeight = retrieve2(tokenStyle.height, token.contentHeight);
         token.innerHeight = tokenHeight;
-        textPadding && (tokenHeight += textPadding[0] + textPadding[2]);
+        textPadding2 && (tokenHeight += textPadding2[0] + textPadding2[2]);
         token.height = tokenHeight;
         token.lineHeight = retrieve3(tokenStyle.lineHeight, style.lineHeight, tokenHeight);
         token.align = tokenStyle && tokenStyle.align || style.align;
@@ -11108,7 +11108,7 @@ var ZRText = class extends Displayable_default {
   _updatePlainTexts() {
     const style = this.style;
     const textFont = style.font || DEFAULT_FONT;
-    const textPadding = style.padding;
+    const textPadding2 = style.padding;
     const text = getStyleText(style);
     const contentBlock = parsePlainText(text, style);
     const needDrawBg = needDrawBackground(style);
@@ -11125,18 +11125,18 @@ var ZRText = class extends Displayable_default {
     const verticalAlign = style.verticalAlign || defaultStyle.verticalAlign || "top";
     let textX = baseX;
     let textY = adjustTextY2(baseY, contentBlock.contentHeight, verticalAlign);
-    if (needDrawBg || textPadding) {
+    if (needDrawBg || textPadding2) {
       const boxX = adjustTextX(baseX, outerWidth, textAlign);
       const boxY = adjustTextY2(baseY, outerHeight, verticalAlign);
       needDrawBg && this._renderBackground(style, style, boxX, boxY, outerWidth, outerHeight);
     }
     textY += lineHeight / 2;
-    if (textPadding) {
-      textX = getTextXForPadding(baseX, textAlign, textPadding);
+    if (textPadding2) {
+      textX = getTextXForPadding(baseX, textAlign, textPadding2);
       if (verticalAlign === "top") {
-        textY += textPadding[0];
+        textY += textPadding2[0];
       } else if (verticalAlign === "bottom") {
-        textY -= textPadding[2];
+        textY -= textPadding2[2];
       }
     }
     let defaultLineWidth = 0;
@@ -11187,7 +11187,7 @@ var ZRText = class extends Displayable_default {
     const contentWidth = contentBlock.width;
     const outerWidth = contentBlock.outerWidth;
     const outerHeight = contentBlock.outerHeight;
-    const textPadding = style.padding;
+    const textPadding2 = style.padding;
     const baseX = style.x || 0;
     const baseY = style.y || 0;
     const defaultStyle = this._defaultStyle;
@@ -11197,9 +11197,9 @@ var ZRText = class extends Displayable_default {
     const boxY = adjustTextY2(baseY, outerHeight, verticalAlign);
     let xLeft = boxX;
     let lineTop = boxY;
-    if (textPadding) {
-      xLeft += textPadding[3];
-      lineTop += textPadding[0];
+    if (textPadding2) {
+      xLeft += textPadding2[3];
+      lineTop += textPadding2[0];
     }
     let xRight = xLeft + contentWidth;
     if (needDrawBackground(style)) {
@@ -11252,10 +11252,10 @@ var ZRText = class extends Displayable_default {
     const needDrawBg = !token.isLineHolder && needDrawBackground(tokenStyle);
     needDrawBg && this._renderBackground(tokenStyle, style, textAlign === "right" ? x - token.width : textAlign === "center" ? x - token.width / 2 : x, y - token.height / 2, token.width, token.height);
     const bgColorDrawn = !!tokenStyle.backgroundColor;
-    const textPadding = token.textPadding;
-    if (textPadding) {
-      x = getTextXForPadding(x, textAlign, textPadding);
-      y -= token.height / 2 - textPadding[0] - token.innerHeight / 2;
+    const textPadding2 = token.textPadding;
+    if (textPadding2) {
+      x = getTextXForPadding(x, textAlign, textPadding2);
+      y -= token.height / 2 - textPadding2[0] - token.innerHeight / 2;
     }
     const el = this._getOrCreateChild(TSpan_default);
     const subElStyle = el.createStyle();
@@ -11402,8 +11402,8 @@ function normalizeStyle(style) {
     let verticalAlign = style.verticalAlign;
     verticalAlign === "center" && (verticalAlign = "middle");
     style.verticalAlign = verticalAlign == null || VALID_TEXT_VERTICAL_ALIGN[verticalAlign] ? verticalAlign : "top";
-    const textPadding = style.padding;
-    if (textPadding) {
+    const textPadding2 = style.padding;
+    if (textPadding2) {
       style.padding = normalizeCssArray(style.padding);
     }
   }
@@ -11414,8 +11414,8 @@ function getStroke(stroke, lineWidth) {
 function getFill(fill) {
   return fill == null || fill === "none" ? null : fill.image || fill.colorStops ? "#000" : fill;
 }
-function getTextXForPadding(x, textAlign, textPadding) {
-  return textAlign === "right" ? x - textPadding[1] : textAlign === "center" ? x + textPadding[3] / 2 - textPadding[1] / 2 : x + textPadding[3];
+function getTextXForPadding(x, textAlign, textPadding2) {
+  return textAlign === "right" ? x - textPadding2[1] : textAlign === "center" ? x + textPadding2[3] / 2 - textPadding2[1] / 2 : x + textPadding2[3];
 }
 function getStyleText(style) {
   let text = style.text;
@@ -24452,6 +24452,18 @@ var ECharts = class extends Eventful_default {
     }, this);
     return !!result;
   }
+  getGridRect(index = 0) {
+    if (this._disposed) {
+      disposedWarning(this.id);
+      return;
+    }
+    const ecModel = this._model;
+    const gird = ecModel.getComponent("grid", index);
+    if (gird && gird.coordinateSystem) {
+      return gird.coordinateSystem.getRect();
+    }
+    return;
+  }
   getVisual(finder, visualType) {
     const ecModel = this._model;
     const parsedFinder = parseFinder(ecModel, finder, {
@@ -46597,7 +46609,7 @@ function renderNode(seriesModel, thisStorage, oldStorage, reRoot, lastsForAnimat
       return;
     }
     const textStyle = textEl.style;
-    const textPadding = normalizeCssArray(textStyle.padding || 0);
+    const textPadding2 = normalizeCssArray(textStyle.padding || 0);
     if (upperLabelRect) {
       rectEl.setTextConfig({
         layoutRect: upperLabelRect
@@ -46605,8 +46617,8 @@ function renderNode(seriesModel, thisStorage, oldStorage, reRoot, lastsForAnimat
       textEl.disableLabelLayout = true;
     }
     textEl.beforeUpdate = function() {
-      const width = Math.max((upperLabelRect ? upperLabelRect.width : rectEl.shape.width) - textPadding[1] - textPadding[3], 0);
-      const height = Math.max((upperLabelRect ? upperLabelRect.height : rectEl.shape.height) - textPadding[0] - textPadding[2], 0);
+      const width = Math.max((upperLabelRect ? upperLabelRect.width : rectEl.shape.width) - textPadding2[1] - textPadding2[3], 0);
+      const height = Math.max((upperLabelRect ? upperLabelRect.height : rectEl.shape.height) - textPadding2[0] - textPadding2[2], 0);
       if (textStyle.width !== width || textStyle.height !== height) {
         textEl.setStyle({
           width,
@@ -57228,10 +57240,10 @@ var MinePolyLinesLayout = {
         for (let i = params.start; i < params.end; i++) {
           const itemModel = data.getItemModel(i);
           const {width, color: color2 = "none", lineStyle, fill = "none", closed = false, curved = false} = itemModel.get("itemStyle");
-          if (!color2 && fill === "none") {
+          if (!color2 && !fill) {
             continue;
           }
-          const key = `${color2 || "none"}:${width}:${lineStyle}:${fill}:${closed}:${curved}`;
+          const key = `${color2 || "none"}:${width}:${lineStyle}:${fill || "none"}:${closed}:${curved}`;
           const points4 = itemModel.get("points");
           const itemPoints = [];
           each(points4, function(item) {
@@ -57596,7 +57608,7 @@ var BoxesView2 = class extends Chart_default {
         style: {
           ...textStyle
         },
-        x: item.align === "center" ? item.x : item.x + 4,
+        x: item.x,
         y: item.y + 2
       });
       if (item.v_align === "middle") {
@@ -57695,14 +57707,14 @@ var BoxesSeries_default = BoxesSeriesModel;
 // src/chart/boxes/util.ts
 var canvas = document.createElement("canvas");
 var ctx = canvas.getContext("2d");
-function findFontSize(text, maxWidth, font = DefaultFamily, minSize = 2, maxSize = 50, tolerance = 8) {
+function findFontSize(text, maxWidth, font = DefaultFamily, tolerance = 8, minSize = 2, maxSize = 50) {
   let low = minSize;
   let high = maxSize;
   while (low <= high) {
     const size = Math.floor((low + high) / 2);
     ctx.font = `${size}px ${font}`;
     const width = ctx.measureText(text).width;
-    if (Math.abs(width - maxWidth) <= tolerance) {
+    if (maxWidth > width && maxWidth - width <= tolerance) {
       return size;
     } else if (width < maxWidth) {
       low = size + 1;
@@ -57717,10 +57729,10 @@ var boxFontSizeMapping = {
   large: 18,
   normal: 14,
   small: 10,
-  tiny: 6
+  tiny: 8
 };
 function getFontSize(size, text, maxWidth, font) {
-  return boxFontSizeMapping[size] || findFontSize(text, maxWidth, font);
+  return boxFontSizeMapping[size] || findFontSize(text, maxWidth, font, 2);
 }
 
 // src/chart/boxes/BoxesLayout.ts
@@ -57735,23 +57747,28 @@ function optimizePoint3(point1, point2, lineWidth) {
     point2[1] = Math.floor(point2[1]) + 0.5;
   }
 }
+var textPadding = 4;
 function getBoxPoint(startPoint, endPoint, text_halign, text_valign) {
-  let x = startPoint[0];
-  let y = startPoint[1];
+  const leftX = Math.min(startPoint[0], endPoint[0]);
+  const rightX = Math.max(startPoint[0], endPoint[0]);
+  const topY = Math.min(startPoint[1], endPoint[1]);
+  const bottomY = Math.max(startPoint[1], endPoint[1]);
+  let x = leftX + textPadding;
+  let y = topY;
   let align = "left";
   let v_align = "top";
   if (text_halign === "align_center") {
     x = (startPoint[0] + endPoint[0]) / 2;
     align = "center";
   } else if (text_halign === "align_right") {
-    x = endPoint[0];
+    x = rightX - textPadding;
     align = "right";
   }
   if (text_valign === "align_center") {
     y = (startPoint[1] + endPoint[1]) / 2;
     v_align = "middle";
   } else if (text_valign === "align_bottom") {
-    y = endPoint[1];
+    y = bottomY;
     v_align = "bottom";
   }
   return {x, y, align, v_align};
@@ -57829,24 +57846,30 @@ var BoxesLayout = {
           const points4 = linesPointById[key] || [];
           optimizePoint3(startPoint, endPoint, border_width);
           const [left, right] = getHExtend(startPoint[0], endPoint[0], extend2);
-          points4.push(left, right, startPoint[1], endPoint[1]);
-          linesPointById[key] = points4;
           if (text) {
-            const width2 = endPoint[0] - startPoint[0];
+            const width2 = Math.abs(endPoint[0] - startPoint[0]);
+            const height = Math.abs(endPoint[1] - startPoint[1]);
+            const minBoxSize = Math.min(width2, height);
+            if (!minBoxSize) {
+              continue;
+            }
             const {x, y, align, v_align} = getBoxPoint(startPoint, endPoint, text_halign, text_valign);
+            const padding = Math.min(minBoxSize / 2, 8);
             textList.push({
               text,
               text_color,
               text_wrap,
-              text_size: getFontSize(text_size, text, width2 - 10, font),
+              text_size: getFontSize(text_size, text, minBoxSize - padding, font),
               align,
               v_align,
               width: width2,
-              height: Math.abs(endPoint[1] - startPoint[1]),
+              height,
               x,
               y
             });
           }
+          points4.push(left, right, startPoint[1], endPoint[1]);
+          linesPointById[key] = points4;
         }
         data.setLayout({
           linesPointById,
@@ -59318,11 +59341,11 @@ var labelFontSizeMapping = {
   large: 18,
   normal: 14,
   small: 10,
-  tiny: 6
+  tiny: 8
 };
 function getSymbolLabelFontSize(size, width) {
   if (size === "auto" && width) {
-    return Math.max(6, width / 2);
+    return Math.max(8, width / 2);
   }
   return labelFontSizeMapping[size] ?? 12;
 }
@@ -74556,7 +74579,7 @@ var MarkLabelView2 = class extends Component_default2 {
         this.removeGraphicLabels(label);
         return;
       }
-      if (!item.labelVisible) {
+      if (!label || !item.labelVisible) {
         return;
       }
       const seriesId = item.seriesId || defaultSeries.id;