tvcharts 0.7.60 → 0.7.61

package/dist/echarts.js

@@ -222,7 +222,7 @@ __export(util_exports, {
 
 // node_modules/tvrender/src/core/platform.ts
 var DEFAULT_FONT_SIZE = 12;
-var DEFAULT_FONT_FAMILY = "sans-serif";
+var DEFAULT_FONT_FAMILY = `-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif`;
 var DEFAULT_FONT = `${DEFAULT_FONT_SIZE}px ${DEFAULT_FONT_FAMILY}`;
 var OFFSET = 20;
 var SCALE = 100;
@@ -7238,7 +7238,7 @@ function getElementSSRData(el) {
 function registerSSRDataGetter(getter) {
   ssrDataGetter = getter;
 }
-var version = "5.6.76";
+var version = "5.6.78";
 
 // src/util/number.ts
 var RADIAN_EPSILON = 1e-4;
@@ -11393,7 +11393,7 @@ var ZRText = class extends Displayable_default {
         style.fontStyle,
         style.fontWeight,
         parseFontSize(style.fontSize),
-        style.fontFamily || "sans-serif"
+        style.fontFamily || DEFAULT_FONT_FAMILY
       ].join(" ");
     }
     return font && trim(font) || style.textFont || style.font;
@@ -72753,6 +72753,31 @@ function getLeftTextX(x, text, textStyle, ecModel) {
   const paddings = normalizeCssArray2(textStyle.padding || 0);
   return x - textRect.width - paddings[1] - paddings[3] - (textStyle.borderWidth || 0) - 1;
 }
+var SECONDS_PER_HOUR = 3600;
+var SECONDS_PER_DAY = 86400;
+var SECONDS_PER_MONTH = 30 * SECONDS_PER_DAY;
+function formatSeconds(seconds2) {
+  if (seconds2 >= SECONDS_PER_DAY) {
+    const months = Math.floor(seconds2 / SECONDS_PER_MONTH);
+    let remaining = seconds2 % SECONDS_PER_MONTH;
+    const days = Math.floor(remaining / SECONDS_PER_DAY);
+    remaining %= SECONDS_PER_DAY;
+    const hours2 = Math.floor(remaining / SECONDS_PER_HOUR);
+    return [
+      months > 0 ? `${months}m` : null,
+      days > 0 ? `${days}d` : null,
+      hours2 > 0 ? `${hours2}h` : null
+    ].filter(Boolean).join(" ");
+  } else {
+    const hours2 = Math.floor(seconds2 / SECONDS_PER_HOUR);
+    const minutes2 = Math.floor(seconds2 % SECONDS_PER_HOUR / 60);
+    const secs = seconds2 % 60;
+    return hours2 > 0 ? `${pad2(hours2)}:${pad2(minutes2)}:${pad2(secs)}` : `${pad2(minutes2)}:${pad2(secs)}`;
+  }
+}
+function pad2(num) {
+  return num.toString().padStart(2, "0");
+}
 
 // src/util/color.ts
 function parseColor(color2) {
@@ -75328,6 +75353,7 @@ var MarkLabelModal2 = class extends Component_default {
           dataMap[key] = this.option.data[key] = merge(item, defaultDataOption);
         } else {
           dataMap[key] = merge(this.option.data[key], item, true);
+          console.log("%c [ item ]-178", "font-size:13px; background:pink; color:#bf2c9f;", item);
         }
         if (item.$action === "remove") {
           this.option.data[key] = void 0;
@@ -75400,7 +75426,7 @@ var markerTypeCalculator2 = {
     return {
       value: seriesData.getByRawIndex(item.valueDim, lastIndex),
       labelTextStyle: {
-        fill: fill ? contrastColor2(fill) : "#fff",
+        fill: fill ? contrastColor2(fill) : "#ffffff",
         backgroundColor: fill ? removeTransparency(fill) : DefaultColor,
         borderWidth: 0
       }
@@ -75455,6 +75481,7 @@ var MarkLabelView2 = class extends Component_default2 {
   }
   init() {
     this.markerGroupMapBySeries = createHashMap();
+    this._timerMap = createHashMap();
     this._graphicLabelElMap = createHashMap();
     this._graphLabelGroup = new Group_default();
     this.group.add(this._graphLabelGroup);
@@ -75470,12 +75497,11 @@ var MarkLabelView2 = class extends Component_default2 {
     if (isUpdateGraphic) {
       this.graphicLabelsResize(ecModel);
     }
-    if (isAvoidOverlap) {
-      this.avoidOverlap();
-    }
+    this.avoidOverlap(isAvoidOverlap);
   }
   updateMarkLabels(markerModel, ecModel) {
     const markerGroupMapBySeries = this.markerGroupMapBySeries;
+    const timerMap = this._timerMap;
     const labelMap = markerModel.labelMap;
     const updatedSeriesByName = {};
     ecModel.eachSeries((seriesModel) => {
@@ -75549,6 +75575,13 @@ var MarkLabelView2 = class extends Component_default2 {
           markerGroupMap.set(item.name, el);
           this.group.add(el);
         }
+        if (item.countDown && item.countDown.show && item.countDown.value) {
+          const key = seriesName + item.name;
+          if (!timerMap.get(key)) {
+            const countDownTextEl = el.childAt(3);
+            this._labelCountDown(item, countDownTextEl, key);
+          }
+        }
         inner21(el).yAxisIndex = yAxisModel.index;
         inner21(el).isSort = item.showName;
       });
@@ -75572,6 +75605,11 @@ var MarkLabelView2 = class extends Component_default2 {
           return;
         }
         markerGroupMap.removeKey(item.name);
+        const downKey = seriesName + item.name;
+        if (timerMap.get(downKey)) {
+          clearTimeout(timerMap.get(downKey));
+          timerMap.removeKey(downKey);
+        }
         this.group.remove(el);
       });
       markerGroupMapBySeries.removeKey(seriesName);
@@ -75684,7 +75722,22 @@ var MarkLabelView2 = class extends Component_default2 {
       graphicLabelElMap.removeKey(option.id);
     });
   }
-  avoidOverlap() {
+  _labelCountDown(item, el, key) {
+    const timerMap = this._timerMap;
+    const timer = setTimeout(() => {
+      item.countDown.value = item.countDown.value - 1;
+      const text = formatSeconds(item.countDown.value);
+      el.attr("style", {text});
+      if (item.countDown.value && item.countDown.show) {
+        this._labelCountDown(item, el, key);
+      } else {
+        el.ignore = true;
+        timerMap.removeKey(key);
+      }
+    }, 1e3);
+    timerMap.set(key, timer);
+  }
+  avoidOverlap(isAvoidOverlap) {
     const labelsByYAxisId = {};
     const markerGroupMapBySeries = this.markerGroupMapBySeries;
     markerGroupMapBySeries.each((markerGroupMap) => {
@@ -75710,24 +75763,28 @@ var MarkLabelView2 = class extends Component_default2 {
       labelsByYAxisId[yAxisId] = labels;
     });
     each(labelsByYAxisId, (labels) => {
-      labelAvoidOverlap(labels);
+      labelAvoidOverlap(labels, isAvoidOverlap);
     });
   }
 };
 var MarkLabelView = MarkLabelView2;
 MarkLabelView.type = "markLabel";
-function textYChange(label, y) {
+function textYChange(label, y, height) {
   if (label.type === "text") {
     label.y = y;
   } else {
     each(label.children(), (item) => {
       if (item.type === "text") {
+        if (inner21(item).labelType === "countDown") {
+          item.y = y + inner21(item).parentHeight;
+          return;
+        }
         item.y = y;
       }
     });
   }
 }
-function labelAvoidOverlap(labels, marginTop = 0) {
+function labelAvoidOverlap(labels, isAvoidOverlap, marginTop = 0) {
   if (labels.length === 0) {
     return;
   }
@@ -75738,18 +75795,18 @@ function labelAvoidOverlap(labels, marginTop = 0) {
   for (let i = 0; i < labels.length; i++) {
     const currentLabel = labels[i];
     let currentLabelY = inner21(currentLabel).y;
-    if (i === 0) {
-      textYChange(currentLabel, currentLabelY - offestY);
+    if (i === 0 || !isAvoidOverlap) {
+      textYChange(currentLabel, currentLabelY - offestY, height);
       continue;
     }
     const prevLabel = labels[i - 1];
     const prevLabelY = sortYbyId[prevLabel.id] ?? inner21(prevLabel).y;
-    const prevHeight = height + marginTop;
+    const prevHeight = inner21(prevLabel).showCountDown ? height * 2 + marginTop - 1 : height + marginTop;
     if (prevLabelY > currentLabelY || Math.abs(currentLabelY - prevLabelY) < prevHeight) {
       currentLabelY = prevLabelY + prevHeight;
     }
     sortYbyId[currentLabel.id] = currentLabelY;
-    textYChange(currentLabel, currentLabelY - offestY);
+    textYChange(currentLabel, currentLabelY - offestY, height);
   }
 }
 function getPaddingByStyle(fontsize, borderWidth = 0) {
@@ -75786,7 +75843,7 @@ function updateText({option, gridRect, position: position2, ecModel, el, y, offs
 }
 function createLabel({x, y, labelData, markerModel, gridRect, position: position2, labelTextStyle = {}, fontSize}) {
   const {zlevel} = markerModel.option;
-  const {lineStyle, showLine, showName, showTitle, title} = labelData;
+  const {lineStyle, showLine, showName, showTitle, title, countDown} = labelData;
   const textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelTextStyle.borderWidth)}, labelTextStyle);
   const text = labelData.text;
   const labelTitle = title || labelData.name;
@@ -75794,10 +75851,17 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   const group = new Group_default();
   const labelY = y;
   const borderWidth = textStyle.borderWidth ?? 0;
+  const font = getFont(textStyle, markerModel.ecModel);
+  const countDownText = countDown && countDown.show && formatSeconds(countDown.value) || "";
+  const renderText = countDownText.length > text.length ? countDownText : text;
+  const textRect = getBoundingRect(renderText, font);
+  const paddings = normalizeCssArray2(textStyle.padding || 0);
+  const textElWidth = textRect.width + paddings[1] + paddings[3];
+  const textElx = isLeft ? x - textElWidth - borderWidth - 1 : x + borderWidth;
   const textEl = new Text_default({
-    x: isLeft ? getLeftTextX(x, text, textStyle, markerModel.ecModel) : x,
+    x: textElx,
     y: labelY,
-    style: Object.assign({text}, textStyle),
+    style: Object.assign({text, width: textRect.width}, textStyle),
     z: 101,
     zlevel,
     ignore: !showName
@@ -75829,16 +75893,41 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   group.add(lineEl);
   group.add(textEl);
   group.add(textNameEl);
+  if (countDown) {
+    const show = countDown.show && !!countDown.value;
+    const offsetY = showName && show ? textRect.height + paddings[0] + paddings[2] - 1 : 0;
+    const fill = textStyle.fill === "#ffffff" ? "rgba(255,255,255,0.9)" : "rgba(0,0,0,0.9)";
+    const countDownEl = new Text_default({
+      x: textElx,
+      y: labelY + offsetY,
+      style: Object.assign({text: countDownText, width: textRect.width}, textStyle, {fill}),
+      z: 101,
+      zlevel,
+      ignore: !show
+    });
+    inner21(group).showCountDown = show;
+    inner21(countDownEl).labelType = "countDown";
+    inner21(countDownEl).parentHeight = offsetY;
+    group.add(countDownEl);
+  }
   return group;
 }
 function updateLabel({x, y, labelData, markerModel, gridRect, position: position2, el, labelTextStyle = {}, fontSize}) {
-  const {lineStyle, showLine, showName, showTitle, title} = labelData;
+  const {lineStyle, showLine, showName, showTitle, title, countDown} = labelData;
   const textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelTextStyle.borderWidth)}, labelTextStyle);
   const borderWidth = textStyle.borderWidth ?? 0;
   const isLeft = position2 === "left";
   if (el.ignore) {
     el.ignore = false;
   }
+  const text = labelData.text;
+  const countDownText = countDown && countDown.show && formatSeconds(countDown.value) || "";
+  const renderText = countDownText.length > text.length ? countDownText : text;
+  const font = getFont(textStyle, markerModel.ecModel);
+  const textRect = getBoundingRect(renderText, font);
+  const paddings = normalizeCssArray2(textStyle.padding || 0);
+  const textElWidth = textRect.width + paddings[1] + paddings[3];
+  const textElx = isLeft ? x - textElWidth - borderWidth - 1 : x + borderWidth;
   const labelY = y;
   inner21(el).y = labelY;
   each(el.children(), (element) => {
@@ -75867,10 +75956,9 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
           return;
         }
         const textLabel = labelData.text;
-        const labelX = isLeft ? getLeftTextX(x, textLabel, textStyle, markerModel.ecModel) - borderWidth : x + borderWidth;
-        element.x = labelX;
+        element.x = textElx;
         element.y = labelY;
-        element.attr("style", Object.assign({text: textLabel}, textStyle));
+        element.attr("style", Object.assign({text: textLabel, width: textRect.width}, textStyle));
         element.ignore = false;
         break;
       case "nameLabel":
@@ -75885,6 +75973,22 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
         element.attr("style", Object.assign({text: labelTitle}, textStyle));
         element.ignore = false;
         break;
+      case "countDown":
+        if (!countDown.show || !countDown.value) {
+          element.ignore = true;
+          inner21(el).showCountDown = false;
+          inner21(element).parentHeight = 0;
+          return;
+        }
+        const offsetY = showName ? textRect.height + paddings[0] + paddings[2] - 1 : 0;
+        inner21(el).showCountDown = true;
+        inner21(element).parentHeight = offsetY;
+        const fill = textStyle.fill === "#ffffff" ? "rgba(255,255,255,0.9)" : "rgba(0,0,0,0.9)";
+        element.x = textElx;
+        element.y = labelY + offsetY;
+        element.attr("style", Object.assign({text: countDownText, width: textRect.width}, textStyle, {fill}));
+        element.ignore = false;
+        break;
     }
   });
 }