tvcharts 0.7.79 → 0.7.81

package/dist/echarts.js

@@ -22568,7 +22568,7 @@ var ArrowUp = Path_default.extend({
     ctx2.lineTo(cx - width + rectWidth, cy + height);
     ctx2.lineTo(cx - width + rectWidth, triangleY);
     ctx2.lineTo(cx - width, triangleY);
-    ctx2.closePath();
+    ctx2.lineTo(cx, cy - height);
   }
 });
 var ArrowUpClose = Path_default.extend({
@@ -22594,7 +22594,7 @@ var ArrowUpClose = Path_default.extend({
     ctx2.lineTo(cx - width + rectWidth, cy + height);
     ctx2.lineTo(cx - width + rectWidth, triangleY);
     ctx2.lineTo(cx - width, triangleY);
-    ctx2.closePath();
+    ctx2.lineTo(cx, cy - height);
     ctx2.rect(cx - width + 0.5, cy - height - 0.5 - rectHeight, shape.width - 0.5, rectHeight);
   }
 });
@@ -22620,7 +22620,7 @@ var ArrowDown = Path_default.extend({
     ctx2.lineTo(cx - width + rectWidth, cy - height);
     ctx2.lineTo(cx - width + rectWidth, triangleY);
     ctx2.lineTo(cx - width, triangleY);
-    ctx2.closePath();
+    ctx2.lineTo(cx, cy + height);
   }
 });
 var ArrowDownClose = Path_default.extend({
@@ -22646,7 +22646,7 @@ var ArrowDownClose = Path_default.extend({
     ctx2.lineTo(cx - width + rectWidth, cy - height);
     ctx2.lineTo(cx - width + rectWidth, triangleY);
     ctx2.lineTo(cx - width, triangleY);
-    ctx2.closePath();
+    ctx2.lineTo(cx, cy + height);
     ctx2.rect(cx - width + 0.5, cy + height + 0.5, shape.width - 0.5, rectHeight);
   }
 });
@@ -56935,10 +56935,10 @@ var StrategyView2 = class extends Chart_default {
             fill: textColor ?? "#fff",
             fontSize: 12,
             stroke: textBorder,
-            lineWidth: textBorderWidth
-          },
-          x: point[0],
-          y: point[1]
+            lineWidth: textBorderWidth,
+            x: point[0],
+            y: point[1]
+          }
         });
         el.states.emphasis = emphasisState;
         symbolGroup.add(el);
@@ -59643,10 +59643,10 @@ var LabelsView2 = class extends Chart_default {
           fontFamily,
           fontSize,
           stroke: textBorderColor,
-          lineWidth: textBorderWidth
-        },
-        x: point[0] + offset[0],
-        y: point[1] + offset[1]
+          lineWidth: textBorderWidth,
+          x: point[0] + offset[0],
+          y: point[1] + offset[1]
+        }
       });
       el.states.emphasis = emphasisState;
       textGroup.add(el);
@@ -59971,10 +59971,24 @@ function changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset) {
   }
   return oldOffset;
 }
+var getTextRect2 = (text, font) => {
+  let width = 0;
+  let height = 0;
+  text.split("\n").forEach((item) => {
+    height = height + getLineHeight(font);
+    width = Math.max(width, getWidth(item, font));
+  });
+  return {
+    width,
+    height
+  };
+};
+var defaultOffset = [0, 0];
+var defaultLabel = {};
 var labelsLayout = {
   seriesType: "labels",
   plan: createRenderPlanner(),
-  reset: function(seriesModel) {
+  reset: function(seriesModel, ecModel) {
     const data = seriesModel.getData();
     const coordSys = seriesModel.coordinateSystem;
     if (!coordSys) {
@@ -59992,6 +60006,9 @@ var labelsLayout = {
     const xOffset = seriesModel.get("offset") || 0;
     const price = getYByLocation2(seriesModel);
     const showLast = seriesModel.get("showLast");
+    const gTextStyleModel = ecModel.getModel("textStyle");
+    const gfontSize = gTextStyleModel && (gTextStyleModel.getShallow("fontSize") || 12) + "px";
+    const gfontFamily = gTextStyleModel && gTextStyleModel.getShallow("fontFamily") || "sans-serif";
     return {
       progress(params, labelsData) {
         const symbolStyleMap = {};
@@ -60010,20 +60027,19 @@ var labelsLayout = {
           }
           const itemModel = data.getItemModel(i);
           const yloc = itemModel.get("yloc");
-          const symbol = itemModel.getShallow("symbol");
-          let symbolSize = itemModel.getShallow("symbolSize");
-          const symbolOffset = itemModel.getShallow("symbolOffset") || [0, 0];
+          const symbol = itemModel.get("symbol");
+          let symbolSize = itemModel.get("symbolSize");
+          const symbolOffset = itemModel.get("symbolOffset") || defaultOffset;
           let symbolShape = {};
-          const style = itemModel.getModel("itemStyle").getItemStyle();
-          const labelModel = itemModel.getModel("label");
-          let oldOffset = labelModel.get("offset") || [0, 0];
-          const align = labelModel.get("align");
+          const labelModel = itemModel.option.label || defaultLabel;
+          let oldOffset = labelModel.offset || defaultOffset;
+          const align = labelModel.align;
           const size = itemModel.get("size") ?? "normal";
-          const text = labelModel.get("formatter");
+          const text = labelModel.formatter;
           const isLabel = labelSymbolByType[symbol];
-          const textShow = labelModel.get("show");
-          let fontSize = labelModel.getShallow("fontSize");
-          let position2 = labelModel.get("position") || "top";
+          const textShow = labelModel.show;
+          let fontSize = labelModel.fontSize;
+          let position2 = labelModel.position || "top";
           if (location === "top" || location === "belowbar") {
             position2 = "bottom";
           }
@@ -60031,15 +60047,18 @@ var labelsLayout = {
             position2 = "inside";
           }
           if (textShow) {
-            labelModel.option.fontSize = fontSize = getSymbolLabelFontSize(size, bandWidth);
+            labelModel.fontSize = fontSize = getSymbolLabelFontSize(size, bandWidth);
           }
           let textRect = void 0;
           if (textShow) {
-            textRect = labelModel.getTextRect(text);
+            textRect = getTextRect2(text, `
+                            ${fontSize || gfontSize} 
+                            ${labelModel.fontFamily || gfontFamily}
+                            `);
             if (isLabel) {
               symbolSize = [textRect.width + HPadding, textRect.height + VPadding];
             }
-            const align2 = labelModel.get("align");
+            const align2 = labelModel.align;
             if (align2 === "left") {
               oldOffset = [-textRect.width / 2, 0];
             } else if (align2 === "right") {
@@ -60068,19 +60087,19 @@ var labelsLayout = {
           if (symbol === "labelCenter") {
             symbolPoint[1] = symbolPoint[1] + symbolRect[1] / 2;
           }
-          if (symbol !== "none" && style.fill) {
+          if (symbol !== "none" && itemModel.option.itemStyle.color) {
             const symbolStyles = symbolStyleMap[symbol] || [];
             symbolStyles.push({
               point: symbolPoint,
               size: symbolRect,
               offset: symbolOffset,
-              color: style.fill,
+              color: itemModel.option.itemStyle.color,
               shape: symbolShape
             });
             symbolStyleMap[symbol] = symbolStyles;
           }
           if (textShow) {
-            const labelPoint = [...symbolPoint];
+            const labelPoint = symbolPoint.slice();
             if (position2 === "inside") {
               labelPoint[1] = labelPoint[1] - textRect.height / 2 - symbolRect[1] / 2;
             } else if (position2 === "top") {
@@ -60093,11 +60112,11 @@ var labelsLayout = {
               align: align || "center",
               point: labelPoint,
               fontSize,
-              textColor: labelModel.get("color") || "#fff",
-              fontFamily: labelModel.get("fontFamily"),
+              textColor: labelModel.color || "#2962FF",
+              fontFamily: labelModel.fontFamily,
               offset: [oldOffset[0] + symbolOffset[0], oldOffset[1] + symbolOffset[1]],
-              textBorderColor: labelModel.get("textBorderColor"),
-              textBorderWidth: labelModel.get("textBorderWidth")
+              textBorderColor: labelModel.textBorderColor,
+              textBorderWidth: labelModel.textBorderWidth
             });
           }
         }
@@ -60431,8 +60450,8 @@ var FillsView_default = FillsView;
 // src/chart/fills/fillsLayout.ts
 function getKey(itemModel) {
   let key = itemModel.option?.color;
-  if (!key && itemModel.get("topValue") !== void 0) {
-    key = `${itemModel.get("topColor") || "rgba(255,255,255,0)"}:${itemModel.get("topValue")}:${itemModel.get("bottomColor") || "rgba(255,255,255,0)"}:${itemModel.get("bottomValue")}`;
+  if (!key && itemModel.get("topValue", true) !== void 0) {
+    key = `${itemModel.get("topColor", true) || "rgba(255,255,255,0)"}:${itemModel.get("topValue", true)}:${itemModel.get("bottomColor", true) || "rgba(255,255,255,0)"}:${itemModel.get("bottomValue", true)}`;
   }
   return key || "transparent";
 }
@@ -75815,7 +75834,7 @@ var MarkLabelView2 = class extends Component_default2 {
           markerGroupMap.set(item.name, el);
           this.group.add(el);
         }
-        if (item.countDown && item.countDown.show && item.countDown.value) {
+        if (item.countDown && item.countDown.show && item.countDown.value > 0) {
           const key = seriesName + item.name;
           if (!timerMap.get(key)) {
             const countDownTextEl = el.childAt(3);