tvcharts 0.7.61 → 0.7.63

package/dist/echarts.js

@@ -7238,7 +7238,7 @@ function getElementSSRData(el) {
 function registerSSRDataGetter(getter) {
   ssrDataGetter = getter;
 }
-var version = "5.6.78";
+var version = "5.6.79";
 
 // src/util/number.ts
 var RADIAN_EPSILON = 1e-4;
@@ -25788,7 +25788,7 @@ ECharts.internalField = function() {
     if (isGroup) {
       const children = el.childrenRef();
       for (let i = 0; i < children.length; i++) {
-        maxZ2 = Math.max(doUpdateZ(children[i], z, el.zLevel ?? zlevel, maxZ2), maxZ2, z2);
+        maxZ2 = Math.max(doUpdateZ(children[i], z, el.zLevel ?? zlevel, maxZ2, z2), maxZ2);
       }
     } else {
       el.z = z;
@@ -33691,7 +33691,8 @@ var Layer = class extends Eventful_default {
       if (clearColor && clearColor !== "transparent") {
         let clearColorGradientOrPattern;
         if (isGradientObject(clearColor)) {
-          const shouldCache = clearColor.global || clearColor.__width === width2 && clearColor.__height === height2;
+          const colorStopStr = clearColor.colorStops.map((item) => item.color + item.offset).toString();
+          const shouldCache = clearColor.global || clearColor.__width === width2 && clearColor.__height === height2 && clearColor._colorStopStr === colorStopStr;
           clearColorGradientOrPattern = shouldCache && clearColor.__canvasGradient || getCanvasGradient(ctx2, clearColor, {
             x: 0,
             y: 0,
@@ -33701,6 +33702,7 @@ var Layer = class extends Eventful_default {
           clearColor.__canvasGradient = clearColorGradientOrPattern;
           clearColor.__width = width2;
           clearColor.__height = height2;
+          clearColor._colorStopStr = colorStopStr;
         } else if (isImagePatternObject(clearColor)) {
           clearColor.scaleX = clearColor.scaleX || horizontalPixelRatio;
           clearColor.scaleY = clearColor.scaleY || verticalPixelRatio;
@@ -64322,7 +64324,6 @@ var BaseAxisPointer = class {
       const hoverBackgroundColor = extraGroupModel.get("hoverBackgroundColor");
       const extraIcon = createIcon(extraGroupModel.get("icon"), {
         x: size[0] / 2,
-        y: size[1] / 2,
         scaleX: size[0] / 2,
         scaleY: size[1] / 2,
         z2: 11,
@@ -64333,7 +64334,6 @@ var BaseAxisPointer = class {
       extraIcon.style.fill = color2;
       const extraRect = new Rect_default({
         shape: {
-          y: -padding / 2,
           x: -padding / 2,
           width: size[0] + padding,
           height: size[1] + padding
@@ -64370,18 +64370,17 @@ var BaseAxisPointer = class {
     const isLeft = position2 === "left";
     const distance2 = extraGroupModel.get("distance");
     extraGroup.x = isLeft ? pointer.shape.x1 + distance2 : pointer.shape.x2 - (size[0] + distance2);
-    extraGroup.y = pointer.shape.y1 - size[1] / 2;
+    extraGroup.y = elOption.label.y;
     extraGroup.eachChild((el) => {
       if (elInner(el).type === "rect") {
         el.attr("shape", {
-          y: -padding / 2,
           x: -padding / 2,
           width: size[0] + padding,
           height: size[1] + padding
         });
       } else {
         el.x = size[0] / 2;
-        el.y = size[1] / 2;
+        el.y = size[1] / 2 + padding / 2;
         el.scaleX = size[0] / 2;
         el.scaleY = size[1] / 2;
       }
@@ -68783,10 +68782,11 @@ var AxisProxy = class {
     let precision = getPixelPrecision(valueWindow, [0, 500]);
     precision = Math.min(precision, 20);
     const rawExtentInfo = axisModel.axis.scale.rawExtentInfo;
-    if (percentWindow[0] !== 0) {
+    const isUseValueRange = this._dataZoomModel.get("useValueRange");
+    if (percentWindow[0] !== 0 || isUseValueRange) {
       rawExtentInfo.setDeterminedMinMax("min", +valueWindow[0].toFixed(precision));
     }
-    if (percentWindow[1] !== 100) {
+    if (percentWindow[1] !== 100 || isUseValueRange) {
       rawExtentInfo.setDeterminedMinMax("max", +valueWindow[1].toFixed(precision));
     }
     rawExtentInfo.freeze();
@@ -72766,7 +72766,7 @@ function formatSeconds(seconds2) {
     return [
       months > 0 ? `${months}m` : null,
       days > 0 ? `${days}d` : null,
-      hours2 > 0 ? `${hours2}h` : null
+      hours2 > 0 && months === 0 ? `${hours2}h` : null
     ].filter(Boolean).join(" ");
   } else {
     const hours2 = Math.floor(seconds2 / SECONDS_PER_HOUR);
@@ -75351,9 +75351,10 @@ var MarkLabelModal2 = class extends Component_default {
       each(markerOpt.data, (item, key) => {
         if (!this.option.data[key]) {
           dataMap[key] = this.option.data[key] = merge(item, defaultDataOption);
+          item.countDown = dataMap[key].countDown;
         } else {
           dataMap[key] = merge(this.option.data[key], item, true);
-          console.log("%c [ item ]-178", "font-size:13px; background:pink; color:#bf2c9f;", item);
+          item.countDown = dataMap[key].countDown;
         }
         if (item.$action === "remove") {
           this.option.data[key] = void 0;
@@ -75384,31 +75385,31 @@ var MarkLabelModal_default = MarkLabelModal;
 // src/component/marker/MarkLabelView.ts
 var DefaultColor = "rgb(41,98,255)";
 var markerTypeCalculator2 = {
-  dataMin: (item, seriesModel) => {
+  dataMin: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     return {
       value: seriesData.getDataExtent(item.valueDim)[0]
     };
   },
-  dataMax: (item, seriesModel) => {
+  dataMax: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     return {
       value: seriesData.getDataExtent(item.valueDim)[1]
     };
   },
-  min: (item, seriesModel) => {
+  min: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     return {
       value: seriesData.getDataExtent(item.valueDim, true)[0]
     };
   },
-  max: (item, seriesModel) => {
+  max: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     return {
       value: seriesData.getDataExtent(item.valueDim, true)[1]
     };
   },
-  rawLast: (item, seriesModel) => {
+  rawLast: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     const lastIndex = seriesData.count(true) - 1;
     let fill = seriesData.getItemVisual(lastIndex, "style")?.fill;
@@ -75432,7 +75433,7 @@ var markerTypeCalculator2 = {
       }
     };
   },
-  last: (item, seriesModel) => {
+  last: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     const count2 = seriesData.count(true);
     const axisModel = seriesModel.getBaseAxis();
@@ -75442,7 +75443,6 @@ var markerTypeCalculator2 = {
     if (lastIndex >= count2 || lastIndex < 0) {
       return null;
     }
-    const backgroundColor2 = seriesModel.ecModel.get("backgroundColor");
     const lastItem = seriesData.count() - 1;
     let fill = isCandle(seriesModel.subType) ? seriesData.getItemVisual(lastItem, "style")?.stroke : seriesData.getItemVisual(lastItem, "style")?.fill;
     if (isPlot(seriesModel.subType)) {
@@ -75460,7 +75460,7 @@ var markerTypeCalculator2 = {
       }
     };
   },
-  allLast: (item, seriesModel) => {
+  allLast: (item, seriesModel, backgroundColor2) => {
     const seriesData = seriesModel.getData();
     const count2 = seriesData.count(true);
     const axisModel = seriesModel.getBaseAxis();
@@ -75468,9 +75468,9 @@ var markerTypeCalculator2 = {
     const offset = seriesModel.get("offset") || 0;
     const lastIndex = extent3[1] + offset;
     if (lastIndex >= count2 || lastIndex < 0) {
-      return markerTypeCalculator2.rawLast(item, seriesModel);
+      return markerTypeCalculator2.rawLast(item, seriesModel, backgroundColor2);
     }
-    return markerTypeCalculator2.last(item, seriesModel);
+    return markerTypeCalculator2.last(item, seriesModel, backgroundColor2);
   }
 };
 var inner21 = makeInner();
@@ -75490,7 +75490,7 @@ var MarkLabelView2 = class extends Component_default2 {
     const isAvoidOverlap = markerModel.get("isAvoidOverlap");
     const type = payload?.type;
     if (type !== "updateComOption") {
-      this.updateMarkLabels(markerModel, ecModel);
+      this.updateMarkLabels(markerModel, ecModel, api2);
     }
     this.updateGraphicLabels(ecModel);
     const isUpdateGraphic = payload?.type ? ["dataZoom", "resize"].includes(payload.type) : Object.keys(ecModel.getNewBaseOption()).some((key) => ["grid", "yAxis", "xAxis"].includes(key));
@@ -75499,11 +75499,20 @@ var MarkLabelView2 = class extends Component_default2 {
     }
     this.avoidOverlap(isAvoidOverlap);
   }
-  updateMarkLabels(markerModel, ecModel) {
+  updateMarkLabels(markerModel, ecModel, api2) {
     const markerGroupMapBySeries = this.markerGroupMapBySeries;
     const timerMap = this._timerMap;
     const labelMap = markerModel.labelMap;
     const updatedSeriesByName = {};
+    const height = api2.getHeight();
+    let backgroundColor2 = ecModel.get("backgroundColor");
+    if (isGradientObject(backgroundColor2) && !backgroundColor2.global && backgroundColor2.type === "linear") {
+      backgroundColor2 = {
+        ...backgroundColor2,
+        global: true,
+        y2: height
+      };
+    }
     ecModel.eachSeries((seriesModel) => {
       const priceScaleInvisible = seriesModel.get("priceScaleInvisible");
       const invisible = seriesModel.get("invisible");
@@ -75538,7 +75547,7 @@ var MarkLabelView2 = class extends Component_default2 {
           return;
         }
         const yCalcFn = markerTypeCalculator2[item.type];
-        const {value, labelTextStyle} = yCalcFn ? yCalcFn(item, seriesModel) || {} : {value: item.value};
+        const {value, labelTextStyle} = yCalcFn ? yCalcFn(item, seriesModel, backgroundColor2) || {} : {value: item.value};
         if (!value) {
           if (el) {
             el.ignore = true;
@@ -75776,10 +75785,10 @@ function textYChange(label, y, height) {
     each(label.children(), (item) => {
       if (item.type === "text") {
         if (inner21(item).labelType === "countDown") {
-          item.y = y + inner21(item).parentHeight;
+          item.attr("style", {y: y + inner21(item).parentHeight});
           return;
         }
-        item.y = y;
+        item.attr("style", {y});
       }
     });
   }
@@ -75859,17 +75868,22 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   const textElWidth = textRect.width + paddings[1] + paddings[3];
   const textElx = isLeft ? x - textElWidth - borderWidth - 1 : x + borderWidth;
   const textEl = new Text_default({
-    x: textElx,
-    y: labelY,
-    style: Object.assign({text, width: textRect.width}, textStyle),
+    style: Object.assign({
+      text,
+      width: textRect.width,
+      x: textElx,
+      y: labelY
+    }, textStyle),
     z: 101,
     zlevel,
     ignore: !showName
   });
   const textNameEl = new Text_default({
-    x: isLeft ? gridRect.x - borderWidth : getLeftTextX(gridRect.x + gridRect.width, labelTitle, textStyle, markerModel.ecModel) + borderWidth,
-    y: labelY,
-    style: Object.assign({text: labelTitle}, textStyle),
+    style: Object.assign({
+      text: labelTitle,
+      x: isLeft ? gridRect.x - borderWidth : getLeftTextX(gridRect.x + gridRect.width, labelTitle, textStyle, markerModel.ecModel) + borderWidth,
+      y: labelY
+    }, textStyle),
     z: 101,
     zlevel,
     ignore: !showTitle
@@ -75896,11 +75910,14 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   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 fill = textStyle.fill === "#ffffff" ? "rgba(255,255,255,0.8)" : "rgba(0,0,0,0.8)";
     const countDownEl = new Text_default({
-      x: textElx,
-      y: labelY + offsetY,
-      style: Object.assign({text: countDownText, width: textRect.width}, textStyle, {fill}),
+      style: Object.assign({
+        text: countDownText,
+        width: textRect.width,
+        x: textElx,
+        y: labelY + offsetY
+      }, textStyle, {fill}),
       z: 101,
       zlevel,
       ignore: !show
@@ -75956,9 +75973,12 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
           return;
         }
         const textLabel = labelData.text;
-        element.x = textElx;
-        element.y = labelY;
-        element.attr("style", Object.assign({text: textLabel, width: textRect.width}, textStyle));
+        element.attr("style", Object.assign({
+          text: textLabel,
+          width: textRect.width,
+          x: textElx,
+          y: labelY
+        }, textStyle));
         element.ignore = false;
         break;
       case "nameLabel":
@@ -75968,9 +75988,7 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
         }
         const labelTitle = title || labelData.name;
         const nameX = isLeft ? gridRect.x : getLeftTextX(gridRect.x + gridRect.width, labelTitle, textStyle, markerModel.ecModel);
-        element.x = nameX;
-        element.y = labelY;
-        element.attr("style", Object.assign({text: labelTitle}, textStyle));
+        element.attr("style", Object.assign({text: labelTitle, x: nameX, y: labelY}, textStyle));
         element.ignore = false;
         break;
       case "countDown":
@@ -75983,10 +76001,13 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
         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}));
+        const fill = textStyle.fill === "#ffffff" ? "rgba(255,255,255,0.8)" : "rgba(0,0,0,0.8)";
+        element.attr("style", Object.assign({
+          text: countDownText,
+          width: textRect.width,
+          x: textElx,
+          y: labelY + offsetY
+        }, textStyle, {fill}));
         element.ignore = false;
         break;
     }