tvcharts 0.6.36 → 0.6.38

package/dist/echarts.js

@@ -22220,13 +22220,14 @@ var ArrowUp = Path_default.extend({
     cy: 0,
     width: 0,
     height: 0,
-    rectWidth: 0
+    rectWidth: 0,
+    triangleHeight: 0
   },
   buildPath: function(ctx, shape) {
-    const {cx, cy, rectWidth} = shape;
+    const {cx, cy, rectWidth, triangleHeight} = shape;
     const width = shape.width / 2;
     const height = shape.height / 2;
-    const triangleY = cy - 2;
+    const triangleY = cy - height + triangleHeight;
     ctx.moveTo(cx, cy - height);
     ctx.lineTo(cx + width, triangleY);
     ctx.lineTo(cx + width - rectWidth, triangleY);
@@ -22244,13 +22245,14 @@ var ArrowDown = Path_default.extend({
     cy: 0,
     width: 0,
     height: 0,
-    rectWidth: 0
+    rectWidth: 0,
+    triangleHeight: 0
   },
   buildPath: function(ctx, shape) {
-    const {cx, cy, rectWidth} = shape;
+    const {cx, cy, rectWidth, triangleHeight} = shape;
     const width = shape.width / 2;
     const height = shape.height / 2;
-    const triangleY = cy + 2;
+    const triangleY = cy + height - triangleHeight;
     ctx.moveTo(cx, cy + height);
     ctx.lineTo(cx + width, triangleY);
     ctx.lineTo(cx + width - rectWidth, triangleY);
@@ -22375,7 +22377,7 @@ var symbolShapeMakers = {
     const offset = 1;
     shape.x = x - w / 2 + offset;
     shape.triangleWidth = parentShape.triangleWidth;
-    shape.y = y - h;
+    shape.y = y - h + parentShape.triangleWidth;
     shape.width = w;
     shape.height = h;
     shape.r = r;
@@ -22385,7 +22387,7 @@ var symbolShapeMakers = {
     const r = 2;
     shape.triangleWidth = triangleWidth;
     shape.x = x + triangleWidth;
-    shape.y = y - h;
+    shape.y = y - h / 2;
     shape.width = w;
     shape.height = h;
     shape.r = r;
@@ -22395,7 +22397,7 @@ var symbolShapeMakers = {
     const r = 2;
     shape.triangleWidth = triangleWidth;
     shape.x = x - w - triangleWidth;
-    shape.y = y - h;
+    shape.y = y - h / 2;
     shape.width = w;
     shape.height = h;
     shape.r = r;
@@ -22431,7 +22433,7 @@ var symbolShapeMakers = {
     const offsetX = parentShape.offsetX;
     const offsetWidth = parentShape.offsetWidth;
     shape.x = x + offsetX;
-    shape.y = y - h - offsetY;
+    shape.y = y - h + parentShape.offsetY;
     shape.width = w;
     shape.height = h;
     shape.r = 2;
@@ -22444,7 +22446,7 @@ var symbolShapeMakers = {
     const offsetX = parentShape.offsetX;
     const offsetWidth = parentShape.offsetWidth;
     shape.x = x - w - offsetX;
-    shape.y = y - h;
+    shape.y = y - h + parentShape.offsetY;
     shape.width = w;
     shape.height = h;
     shape.r = 2;
@@ -22478,14 +22480,16 @@ var symbolShapeMakers = {
   },
   arrowUp: function(x, y, w, h, shape, parentShape) {
     shape.rectWidth = parentShape.triangleWidth;
-    shape.cx = x + 1;
+    shape.triangleHeight = parentShape.triangleHeight;
+    shape.cx = x;
     shape.cy = y;
     shape.width = w;
     shape.height = h;
   },
   arrowDown: function(x, y, w, h, shape, parentShape) {
     shape.rectWidth = parentShape.triangleWidth;
-    shape.cx = x + 1;
+    shape.triangleHeight = parentShape.triangleHeight;
+    shape.cx = x;
     shape.cy = y;
     shape.width = w;
     shape.height = h;
@@ -55517,7 +55521,7 @@ var LabelsView2 = class extends Chart_default {
         },
         style: {
           fill: "none",
-          lineWidth: isLine ? 2 : void 0
+          lineWidth: isLine ? 3 : void 0
         }
       });
       el.symbolProxy = createSymbol(key, 0, 0, 0, 0);
@@ -55552,7 +55556,7 @@ var xCrossMapping = {
   small: () => ({w: 25, h: 21}),
   tiny: () => ({w: 20, h: 17}),
   auto: (width) => {
-    return {w: width, h: width};
+    return {w: width * 0.7, h: width * 0.7};
   }
 };
 var lCrossMapping = {
@@ -55562,7 +55566,7 @@ var lCrossMapping = {
   small: () => ({w: 24, h: 20}),
   tiny: () => ({w: 18, h: 16}),
   auto: (width) => {
-    return {w: width, h: width};
+    return {w: width * 0.7, h: width * 0.7};
   }
 };
 var triangleMapping = {
@@ -55623,17 +55627,25 @@ var rectMapping = {
   small: () => ({w: 21, h: 21}),
   tiny: () => ({w: 17, h: 17}),
   auto: (width) => {
-    return {w: width, h: width};
+    return {w: width * 0.7, h: width * 0.7};
   }
 };
+var getArrowShape = (width, height, baseW) => {
+  const w = width * 0.6;
+  const rectHeight = Math.max(Math.floor((baseW - w) / 3), 0);
+  return {w, h: height, shape: {triangleWidth: Math.floor(w / 10 * 3), triangleHeight: height - rectHeight}};
+};
 var arrowMapping = {
-  huge: () => ({w: 40, h: 45, shape: {triangleWidth: 12}}),
-  large: () => ({w: 30, h: 35, shape: {triangleWidth: 8}}),
-  normal: () => ({w: 25, h: 27, shape: {triangleWidth: 6}}),
-  small: () => ({w: 17, h: 21, shape: {triangleWidth: 4}}),
-  tiny: () => ({w: 15, h: 17, shape: {triangleWidth: 3}}),
+  huge: (width) => getArrowShape(width, 51, 114),
+  large: (width) => getArrowShape(width, 39, 82),
+  normal: (width) => {
+    return getArrowShape(width, 28, 54);
+  },
+  small: (width) => getArrowShape(width, 21, 34),
+  tiny: (width) => getArrowShape(width, 17, 18),
   auto: (width) => {
-    return {w: width, h: width + 4, shape: {triangleWidth: Math.max(width / 3, 3)}};
+    const w = width * 0.6;
+    return {w, h: w, shape: {triangleWidth: Math.floor(w / 10 * 3), triangleHeight: w / 2}};
   }
 };
 var symbolSizeMapping = {
@@ -55697,6 +55709,7 @@ var labelSymbols = [
   "labelUpperRight",
   "labelCenter"
 ];
+var upSymbols = ["labelUp", "labelUpperLeft", "labelUpperRight"];
 var labelSymbolByType = {};
 each(labelSymbols, function(type) {
   labelSymbolByType[type] = 1;
@@ -55708,19 +55721,19 @@ function changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset) {
     case "labelDown":
       return [offsetX, offsetY - shape.triangleWidth];
     case "labelUp":
-      break;
+      return [offsetX, offsetY + shape.triangleWidth];
     case "labelLeft":
-      return [offsetX + shape.triangleWidth + symbolRect[0] / 2, offsetY];
+      return [offsetX + shape.triangleWidth + symbolRect[0] / 2, offsetY + symbolRect[1] / 2];
     case "labelRight":
-      return [offsetX - shape.triangleWidth - symbolRect[0] / 2, offsetY];
+      return [offsetX - shape.triangleWidth - symbolRect[0] / 2, offsetY + symbolRect[1] / 2];
     case "labelLowerLeft":
       return [offsetX + shape.offsetX / 2 + symbolRect[0] / 2, offsetY - shape.offsetY];
     case "labelLowerRight":
       return [offsetX - shape.offsetX - symbolRect[0] / 2, offsetY - shape.offsetY];
     case "labelUpperLeft":
-      return [offsetX + shape.offsetX + symbolRect[0] / 2, offsetY + shape.offsetWidth - symbolRect[1] / 2];
+      return [offsetX + shape.offsetX + symbolRect[0] / 2, offsetY + shape.offsetY];
     case "labelUpperRight":
-      return [offsetX - shape.offsetX - symbolRect[0] / 2, offsetY];
+      return [offsetX - shape.offsetX - symbolRect[0] / 2, offsetY + shape.offsetY];
   }
   return oldOffset;
 }
@@ -55733,7 +55746,7 @@ var labelsLayout = {
     if (!coordSys) {
       return;
     }
-    const bandWidth = Math.max(1, Math.round(seriesModel.coordinateSystem.getAxesByScale("ordinal")[0].scale.barSpace * 0.8));
+    const bandWidth = Math.max(1, Math.round(coordSys.getAxesByScale("ordinal")[0].scale.barSpace * 0.8));
     const location = seriesModel.get("location");
     const dims = map(coordSys.dimensions, function(dim) {
       return data.mapDimension(dim);
@@ -55761,6 +55774,7 @@ var labelsLayout = {
             continue;
           }
           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];
@@ -55772,19 +55786,19 @@ var labelsLayout = {
           const size = itemModel.get("size") ?? "normal";
           const text = labelModel.get("formatter");
           const isLabel = labelSymbolByType[symbol];
-          const labelShow = labelModel.get("show");
+          const textShow = labelModel.get("show");
           let fontSize = labelModel.getShallow("fontSize");
-          let position2 = "top";
-          if (location === "top") {
+          let position2 = labelModel.get("position") || "top";
+          if (location === "top" || location === "belowbar") {
             position2 = "bottom";
-          } else {
-            position2 = isLabel || symbol === "textOutline" ? "inside" : "top";
+          } else if (isLabel || symbol === "textOutline") {
+            position2 = "inside";
           }
-          if (!fontSize && labelShow) {
+          if (textShow) {
             labelModel.option.fontSize = fontSize = getSymbolLabelFontSize(size, bandWidth);
           }
           let textRect = void 0;
-          if (labelShow) {
+          if (textShow) {
             textRect = labelModel.getTextRect(text);
             if (isLabel) {
               symbolSize = [textRect.width + padding, textRect.height + padding];
@@ -55797,17 +55811,23 @@ var labelsLayout = {
             }
           }
           const {w, h, shape} = getSymbolSize2(symbol, size, bandWidth);
-          if (isLabel ? !labelShow || !text : true) {
+          if (isLabel ? !textShow || !text : true) {
             symbolSize = [w, h];
           }
           const symbolRect = Array.isArray(symbolSize) ? symbolSize : [symbolSize, symbolSize];
           if (shape) {
             symbolShape = shape;
-            if (labelShow) {
+            if (textShow) {
               oldOffset = changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset);
             }
           }
           const symbolPoint = [point[0], price || point[1]];
+          if ((yloc === "belowbar" || yloc === "price") && upSymbols.includes(symbol)) {
+            symbolPoint[1] = symbolPoint[1] + symbolRect[1];
+          }
+          if (symbol === "labelCenter") {
+            symbolPoint[1] = symbolPoint[1] + symbolRect[1] / 2;
+          }
           if (symbol !== "none" && style.fill) {
             const symbolStyles = symbolStyleMap[symbol] || [];
             symbolStyles.push({
@@ -55819,14 +55839,14 @@ var labelsLayout = {
             });
             symbolStyleMap[symbol] = symbolStyles;
           }
-          if (labelShow) {
+          if (textShow) {
             const labelPoint = [...symbolPoint];
             if (position2 === "inside") {
               labelPoint[1] = labelPoint[1] - textRect.height / 2 - symbolRect[1] / 2;
             } else if (position2 === "top") {
               labelPoint[1] = labelPoint[1] - symbolRect[1] - textRect.height / 2 - 10;
             } else {
-              labelPoint[1] = labelPoint[1] + 10;
+              labelPoint[1] = labelPoint[1] + symbolRect[1] - textRect.height / 2 + 10;
             }
             textList.push({
               text,
@@ -64668,7 +64688,12 @@ function installDataZoomAction(registers) {
           });
         });
       }
-      dataZoomModel.setRawRange({
+      dataZoomModel.setRawRange(isLocalDataZoom ? {
+        start: payload.start,
+        end: payload.end,
+        lastBarRightSideDiffBarCount: payload.lastBarRightSideDiffBarCount,
+        barSpace: payload.barSpace
+      } : {
         start: payload.start,
         end: payload.end,
         startValue: payload.startValue,
@@ -70377,7 +70402,8 @@ var markerTypeCalculator2 = {
       value: seriesData.getByRawIndex(item.valueDim, lastIndex),
       labelTextStyle: {
         fill: "#fff",
-        backgroundColor: fill
+        backgroundColor: fill,
+        borderWidth: 0
       }
     };
   },
@@ -70449,7 +70475,7 @@ var MarkLabelView2 = class extends Component_default2 {
     const labelMap = markerModel.labelMap;
     const updatedSeriesByName = {};
     ecModel.eachSeries((seriesModel) => {
-      const invisible = seriesModel.get("invisible");
+      const invisible = seriesModel.get("priceScaleInvisible");
       if (invisible) {
         return;
       }
@@ -70755,7 +70781,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 textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelData.textStyle.borderWidth)});
+  const textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelTextStyle.borderWidth)}, labelTextStyle);
   const text = labelData.text;
   const labelTitle = title || labelData.name;
   const isLeft = position2 === "left";
@@ -70765,7 +70791,7 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   const textEl = new Text_default({
     x: isLeft ? getLeftTextX(x, text, textStyle, markerModel.ecModel) : x,
     y: labelY,
-    style: Object.assign({text}, textStyle, labelTextStyle),
+    style: Object.assign({text}, textStyle),
     z: 101,
     zlevel,
     ignore: !showName
@@ -70773,7 +70799,7 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
   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, labelTextStyle),
+    style: Object.assign({text: labelTitle}, textStyle),
     z: 101,
     zlevel,
     ignore: !showTitle
@@ -70800,7 +70826,7 @@ function createLabel({x, y, labelData, markerModel, gridRect, position: position
 }
 function updateLabel({x, y, labelData, markerModel, gridRect, position: position2, el, labelTextStyle, fontSize}) {
   const {lineStyle, showLine, showName, showTitle, title} = labelData;
-  const textStyle = Object.assign(labelData.textStyle ?? {}, {fontSize, padding: getPaddingByStyle(fontSize, labelData.textStyle.borderWidth)});
+  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) {
@@ -70836,7 +70862,7 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
         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.attr("style", Object.assign({text: textLabel}, textStyle));
         element.ignore = false;
         break;
       case "nameLabel":
@@ -70848,7 +70874,7 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
         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, labelTextStyle));
+        element.attr("style", Object.assign({text: labelTitle}, textStyle));
         element.ignore = false;
         break;
     }
@@ -72092,7 +72118,7 @@ function installDataZoomRoamProcessor(registers) {
       const controllerParams = mergeControllerParams(dataZoomInfoMap);
       controller.enable(controllerParams.controlType, controllerParams.opt);
       controller.setPointerChecker(coordSysRecord.containsPoint);
-      createOrUpdate(coordSysRecord, "dispatchAction", 60, "fixRate");
+      createOrUpdate(coordSysRecord, "dispatchAction", 30, "fixRate");
     });
   });
 }