tvcharts 0.5.82 → 0.5.83

package/dist/echarts.js

@@ -38457,16 +38457,65 @@ var AxisView2 = class extends Component_default2 {
     this.axisPointerClass && fixValue(axisModel);
     super.render.apply(this, arguments);
     this._doUpdateAxisPointerClass(axisModel, api2, true);
+    this.updateAxisRange(axisModel, ecModel, api2, payload);
   }
   updateAxisPointer(axisModel, ecModel, api2, payload) {
     this._doUpdateAxisPointerClass(axisModel, api2, false);
   }
+  updateAxisRange(axisModel, ecModel, api2, payload) {
+    const {name, y, height, style, z, zlevel, status} = payload;
+    if (status === "hide") {
+      this.removeRangeRect(api2);
+      return;
+    }
+    if (name !== axisModel.name) {
+      return;
+    }
+    const layoutInfo = layout4(axisModel.axis.grid.model, axisModel);
+    const width = axisModel.get("width") ?? 65;
+    this._rangePayload = payload;
+    const x = layoutInfo.labelDirection > 0 ? layoutInfo.position[0] : layoutInfo.position[0] + layoutInfo.labelDirection * width;
+    if (this._rangeRect) {
+      this._rangeRect.attr({
+        shape: {
+          x,
+          y,
+          width,
+          height
+        },
+        style,
+        z,
+        zlevel
+      });
+    } else {
+      this._rangeRect = new Rect_default({
+        shape: {
+          x: layoutInfo.position[0],
+          y,
+          width,
+          height
+        },
+        style,
+        z,
+        zlevel
+      });
+      api2.getZr().add(this._rangeRect);
+    }
+  }
+  removeRangeRect(api2) {
+    if (this._rangeRect) {
+      api2.getZr().remove(this._rangeRect);
+      this._rangeRect = void 0;
+    }
+    ;
+  }
   remove(ecModel, api2) {
     const axisPointer = this._axisPointer;
     axisPointer && axisPointer.remove(api2);
   }
   dispose(ecModel, api2) {
     this._disposeAxisPointer(api2);
+    this.removeRangeRect(api2);
     super.dispose.apply(this, arguments);
   }
   _doUpdateAxisPointerClass(axisModel, api2, forceRender) {
@@ -57005,7 +57054,7 @@ var GraphicComponentModel2 = class extends Component_default {
         newElOption.getElementLabels = resultItem.existing.getElementLabels;
       }
       elOptionsToUpdate.push(newElOption);
-      if (newElOption.getElementLabels) {
+      if (newElOption.getElementLabels && newElOption.labelVisible) {
         includesLabelOptionsToUpdate.push(newElOption);
       }
       setKeyInfoToNewElOption(resultItem, newElOption);
@@ -58115,6 +58164,11 @@ function install29(registers) {
     event: "updateAxisPointer",
     update: ":updateAxisPointer"
   }, axisTrigger);
+  registers.registerAction({
+    type: "updateAxisRange",
+    event: "updateAxisRange",
+    update: "yAxis:updateAxisRange"
+  }, noop);
 }
 
 // src/component/grid/install.ts
@@ -66952,8 +67006,7 @@ var markerTypeCalculator2 = {
       labelTextStyle: {
         fill,
         backgroundColor: backgroundColor2,
-        borderColor: fill,
-        borderWidth: 1
+        borderColor: fill
       }
     };
   }
@@ -66975,16 +67028,13 @@ var MarkLabelView2 = class extends Component_default2 {
     if (type !== "updateComOption") {
       this.updateMarkLabels(markerModel, ecModel);
     }
+    this.graphicLabelsResize(ecModel);
     this.updateGraphicLabels(ecModel);
-    if (["dataZoom", "resize"].includes(type)) {
-      this.graphicLabelsResize(ecModel);
-    }
     this.avoidOverlap();
   }
   updateMarkLabels(markerModel, ecModel) {
     const markerGroupMap = this.markerGroupMap;
     const labelMap = markerModel.labelMap;
-    console.log("%c [ labelMap ]-148", "font-size:13px; background:pink; color:#bf2c9f;", labelMap);
     ecModel.eachSeries((seriesModel) => {
       const seriesName = seriesModel.name;
       const markLabelData = labelMap.get(seriesName);
@@ -67062,7 +67112,7 @@ var MarkLabelView2 = class extends Component_default2 {
     const labelsBySeriesId = {};
     each(labelOptions, (item) => {
       const label = item.getElementLabels();
-      if (item.$action === "remove" || !item.labelVisible) {
+      if (item.$action === "remove" || item.labelVisible === false) {
         this.removeGraphicLabels(label);
         return;
       }
@@ -67184,7 +67234,7 @@ function labelAvoidOverlap(labels, marginTop = 0) {
     const currentLabel = labels[i];
     const prevHeight = 18 + marginTop;
     let currentLabelY = inner21(currentLabel).y;
-    if (Math.abs(currentLabelY - prevLabelY) < prevHeight) {
+    if (prevLabelY > currentLabelY || Math.abs(currentLabelY - prevLabelY) < prevHeight) {
       currentLabelY = prevLabelY + prevHeight;
     }
     sortYbyId[currentLabel.id] = currentLabelY;
@@ -67203,7 +67253,7 @@ function getLeftTextX(x, text, textStyle, ecModel) {
   const font = getFont(textStyle, ecModel);
   const textRect = getBoundingRect(text, font);
   const paddings = normalizeCssArray2(textStyle.padding || 0);
-  return x - textRect.width - paddings[1] - paddings[3] - 1;
+  return x - textRect.width - paddings[1] - paddings[3] - (textStyle.borderWidth || 0) - 1;
 }
 function createText({option, gridRect, position: position2, ecModel, y, offset}) {
   const isLeft = position2 === "left";
@@ -67232,11 +67282,13 @@ function updateText({option, gridRect, position: position2, ecModel, el, y, offs
 }
 function createLabel({x, y, labelData, markerModel, gridRect, position: position2, labelTextStyle}) {
   const {zlevel} = markerModel.option;
-  const {textStyle, lineStyle, showLine, showName, showTitle} = labelData;
+  const {textStyle, lineStyle, showLine, showName, showTitle, title} = labelData;
   const text = labelData.text;
+  const labelTitle = title || labelData.name;
   const isLeft = position2 === "left";
   const group = new Group_default();
   const labelY = y - 9;
+  const borderWidth = textStyle.borderWidth ?? 0;
   const textEl = new Text_default({
     x: isLeft ? getLeftTextX(x, text, textStyle, markerModel.ecModel) : x,
     y: labelY,
@@ -67246,9 +67298,9 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
     ignore: !showName
   });
   const textNameEl = new Text_default({
-    x: isLeft ? gridRect.x : getLeftTextX(gridRect.x + gridRect.width, labelData.name, textStyle, markerModel.ecModel),
+    x: isLeft ? gridRect.x - borderWidth : getLeftTextX(gridRect.x + gridRect.width, labelTitle, textStyle, markerModel.ecModel) + borderWidth,
     y: labelY,
-    style: Object.assign({text: labelData.name}, textStyle, labelTextStyle),
+    style: Object.assign({text: labelTitle}, textStyle, labelTextStyle),
     z: 101,
     zlevel,
     ignore: !showTitle
@@ -67274,7 +67326,8 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   return group;
 }
 function updateLabel({x, y, labelData, markerModel, gridRect, position: position2, el, labelTextStyle}) {
-  const {textStyle = {}, lineStyle, showLine, showName, showTitle} = labelData;
+  const {textStyle = {}, lineStyle, showLine, showName, showTitle, title} = labelData;
+  const borderWidth = textStyle.borderWidth ?? 0;
   const isLeft = position2 === "left";
   if (el.ignore) {
     el.ignore = false;
@@ -67306,9 +67359,8 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
           return;
         }
         const textLabel = labelData.text;
-        const labelX = isLeft ? getLeftTextX(x, textLabel, textStyle, markerModel.ecModel) : x;
-        const margin = isLeft ? -1 : 1;
-        element.x = labelX + (labelTextStyle?.borderWidth ? margin : 0);
+        const labelX = isLeft ? getLeftTextX(x, textLabel, textStyle, markerModel.ecModel) - borderWidth : x + borderWidth;
+        element.x = labelX;
         element.y = labelY;
         element.attr("style", Object.assign({text: textLabel}, textStyle, labelTextStyle));
         element.ignore = false;
@@ -67318,11 +67370,11 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
           element.ignore = true;
           return;
         }
-        const nameLabel = labelData.name;
-        const nameX = isLeft ? gridRect.x : getLeftTextX(gridRect.x + gridRect.width, nameLabel, textStyle, markerModel.ecModel);
+        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: nameLabel}, textStyle, labelTextStyle));
+        element.attr("style", Object.assign({text: labelTitle}, textStyle, labelTextStyle));
         element.ignore = false;
         break;
     }