tvcharts 0.6.36 → 0.6.37

package/lib/chart/labels/LabelsView.js

@@ -164,7 +164,7 @@ var LabelsView = /** @class */function (_super) {
         style: {
           fill: 'none',
           // stroke: null,
-          lineWidth: isLine ? 2 : void 0
+          lineWidth: isLine ? 3 : void 0
         }
       });
       el.symbolProxy = createSymbol(key, 0, 0, 0, 0);

package/lib/chart/labels/SymbolPath.js

@@ -87,6 +87,7 @@ var SymbolPath = /** @class */function (_super) {
       path.beginPathFill();
       symbolProxyShape.x = x - (needCenter ? width / 2 : 0) + xOffset;
       symbolProxyShape.y = y - (needCenter ? height / 2 : 0) + yOffset;
+      // symbolProxyShape.y = y + yOffset;
       symbolProxyShape.width = width;
       symbolProxyShape.height = height;
       symbolProxy.buildPath(path, __assign(__assign({}, symbolProxyShape), points[i].shape), true);

package/lib/chart/labels/labelsLayout.js

@@ -62,7 +62,13 @@ function getYByLocation(seriesModel) {
   return Math.floor(location === 'top' ? end * boundaryGapX + 30 : end * (1 - boundaryGapY) + 30);
 }
 var labelSymbols = ['labelDown', 'labelUp', 'labelLeft', 'labelRight', 'labelLowerLeft', 'labelLowerRight', 'labelUpperLeft', 'labelUpperRight', 'labelCenter'];
+var upSymbols = ['labelUp', 'labelUpperLeft', 'labelUpperRight'];
 var labelSymbolByType = {};
+var belowbarNotSymbol = {
+  labelLeft: 1,
+  labelRight: 1,
+  labelCenter: 1
+};
 each(labelSymbols, function (type) {
   labelSymbolByType[type] = 1;
 });
@@ -75,21 +81,23 @@ function changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset) {
     case 'labelDown':
       return [offsetX, offsetY - shape.triangleWidth];
     case 'labelUp':
-      //    label.option.offset = [offsetX, offsetY + shape.triangleWidth / 2];
-      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];
+    // case 'labelCenter':
+    //     return [offsetX, offsetY + symbolRect[1]];
   }
+
   return oldOffset;
 }
 var labelsLayout = {
@@ -136,6 +144,7 @@ var labelsLayout = {
             continue;
           }
           var itemModel = data.getItemModel(i);
+          var yloc = itemModel.get('yloc');
           var symbol = itemModel.getShallow('symbol');
           var symbolSize = itemModel.getShallow('symbolSize');
           // let symbolRotate = itemModel.getShallow('symbolRotate');
@@ -148,19 +157,23 @@ var labelsLayout = {
           var size = (_a = itemModel.get('size')) !== null && _a !== void 0 ? _a : 'normal';
           var text = labelModel.get('formatter');
           var isLabel = labelSymbolByType[symbol];
-          var labelShow = labelModel.get('show');
+          var textShow = labelModel.get('show');
           var fontSize = labelModel.getShallow('fontSize');
-          var position = 'top';
-          if (location === 'top') {
+          var position = labelModel.get('position') || 'top';
+          // const isBelowbar = yloc === 'belowbar';
+          // if (isBelowbar) {
+          //     position = 'bottom';
+          // }
+          if (location === 'top' || location === 'belowbar') {
             position = 'bottom';
-          } else {
-            position = isLabel || symbol === 'textOutline' ? 'inside' : 'top';
+          } else if (isLabel || symbol === 'textOutline') {
+            position = 'inside';
           }
-          if (!fontSize && labelShow) {
+          if (textShow) {
             labelModel.option.fontSize = fontSize = getSymbolLabelFontSize(size, bandWidth);
           }
           var textRect = void 0;
-          if (labelShow) {
+          if (textShow) {
             textRect = labelModel.getTextRect(text);
             if (isLabel) {
               symbolSize = [textRect.width + padding, textRect.height + padding];
@@ -177,17 +190,25 @@ var labelsLayout = {
             w = _b.w,
             h = _b.h,
             shape = _b.shape;
-          if (isLabel ? !labelShow || !text : true) {
+          if (isLabel ? !textShow || !text : true) {
             symbolSize = [w, h];
           }
           var symbolRect = Array.isArray(symbolSize) ? symbolSize : [symbolSize, symbolSize];
           if (shape) {
             symbolShape = shape;
-            if (labelShow) {
+            if (textShow) {
               oldOffset = changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset);
             }
           }
           var symbolPoint = [point[0], price || point[1]];
+          // y轴位置靠下时
+          if ((yloc === 'belowbar' || yloc === 'price') && upSymbols.includes(symbol)) {
+            symbolPoint[1] = symbolPoint[1] + symbolRect[1];
+          }
+          // 为居中label时特殊处理
+          if (symbol === 'labelCenter') {
+            symbolPoint[1] = symbolPoint[1] + symbolRect[1] / 2;
+          }
           if (symbol !== 'none' && style.fill) {
             var symbolStyles = symbolStyleMap[symbol] || [];
             symbolStyles.push({
@@ -199,14 +220,14 @@ var labelsLayout = {
             });
             symbolStyleMap[symbol] = symbolStyles;
           }
-          if (labelShow) {
+          if (textShow) {
             var labelPoint = __spreadArray([], symbolPoint, true);
             if (position === 'inside') {
               labelPoint[1] = labelPoint[1] - textRect.height / 2 - symbolRect[1] / 2;
             } else if (position === '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: text,

package/lib/util/symbol.js

@@ -758,7 +758,7 @@ var symbolShapeMakers = {
     var 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;
@@ -768,7 +768,7 @@ var symbolShapeMakers = {
     var 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;
@@ -778,7 +778,7 @@ var symbolShapeMakers = {
     var 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;
@@ -815,7 +815,7 @@ var symbolShapeMakers = {
     var offsetX = parentShape.offsetX;
     var 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;
@@ -828,7 +828,7 @@ var symbolShapeMakers = {
     var offsetX = parentShape.offsetX;
     var 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;

package/lib/util/symbolSize.js

@@ -56,8 +56,8 @@ var xCrossMapping = {
   },
   auto: function (width) {
     return {
-      w: width,
-      h: width
+      w: width * 0.7,
+      h: width * 0.7
     };
   }
 };
@@ -94,8 +94,8 @@ var lCrossMapping = {
   },
   auto: function (width) {
     return {
-      w: width,
-      h: width
+      w: width * 0.7,
+      h: width * 0.7
     };
   }
 };
@@ -373,8 +373,8 @@ var rectMapping = {
   },
   auto: function (width) {
     return {
-      w: width,
-      h: width
+      w: width * 0.7,
+      h: width * 0.7
     };
   }
 };
@@ -471,7 +471,7 @@ var labelFontSizeMapping = {
 };
 function getSymbolLabelFontSize(size, width) {
   var _a;
-  if (size === "auto" && width) {
+  if (size === 'auto' && width) {
     return Math.max(6, width / 2);
   }
   return (_a = labelFontSizeMapping[size]) !== null && _a !== void 0 ? _a : 12;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.6.36",
+  "version": "0.6.37",
   "description": "基于echarts5.5.0二次开发",
   "license": "Apache-2.0",
   "keywords": [

package/types/src/chart/labels/LabelsSeries.d.ts

@@ -18,6 +18,7 @@ interface LabelsStatesOptionMixin {
     };
 }
 export interface LabelsDataItemOption extends SymbolOptionMixin, LabelsStateOption, StatesOptionMixin<LabelsStateOption, LabelsStatesOptionMixin>, OptionDataItemObject<OptionDataValue> {
+    yloc?: 'abovebar' | 'price' | 'belowbar';
 }
 export interface LabelsSeriesOption extends SeriesOption<LabelsStateOption<CallbackDataParams>, LabelsStatesOptionMixin>, LabelsStateOption<CallbackDataParams>, SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin, SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SeriesLargeOptionMixin, SeriesStackOptionMixin, SymbolOptionMixin<CallbackDataParams>, SeriesEncodeOptionMixin {
     type?: 'labels';