tvcharts 0.7.41 → 0.7.43

package/lib/chart/boxes/BoxesLayout.js

@@ -166,7 +166,7 @@ var BoxesLayout = {
             var width_1 = Math.abs(endPoint[0] - startPoint[0]);
             var height = Math.abs(endPoint[1] - startPoint[1]);
             var minBoxSize = Math.min(width_1, height);
-            if (!minBoxSize) {
+            if (!minBoxSize && text_size === 'auto') {
               continue;
             }
             var _c = getBoxPoint(startPoint, endPoint, text_halign, text_valign),

package/lib/chart/fills/FillsView.js

@@ -106,7 +106,8 @@ var FillsView = /** @class */function (_super) {
         },
         style: {
           // fill: key,
-          fill: fill
+          fill: fill,
+          lineJoin: 'round'
         },
         z2: isDefaultFill ? -1 : z2
       });

package/lib/chart/labels/labelsLayout.js

@@ -207,8 +207,9 @@ var labelsLayout = {
           if (location === 'top') {
             symbolPoint[1] = symbolPoint[1] + symbolRect[1];
           }
+          var ylocIsBottom = yloc ? yloc === 'belowbar' || yloc === 'price' : true;
           // y轴位置靠下时
-          if ((yloc === 'belowbar' || yloc === 'price') && upSymbols.includes(symbol)) {
+          if (ylocIsBottom && upSymbols.includes(symbol)) {
             symbolPoint[1] = symbolPoint[1] + symbolRect[1];
           }
           // 为居中label时特殊处理

package/lib/chart/linesPlot/LinesPlotView.js

@@ -279,7 +279,8 @@ var LinesPlotView = /** @class */function (_super) {
           style: {
             lineDash: lineDash,
             stroke: visualColor_1 || color,
-            lineWidth: +lineWidth
+            lineWidth: +lineWidth,
+            lineJoin: 'round'
           },
           z2: isDefaultColor ? LastZ2 : z2_1
         });
@@ -318,7 +319,8 @@ var LinesPlotView = /** @class */function (_super) {
           },
           style: {
             stroke: 'none',
-            fill: visualColor_2 || color
+            fill: visualColor_2 || color,
+            lineJoin: 'round'
           },
           z2: isDefaultColor ? LastZ2 : z2_2
         });

package/lib/chart/mineLines/util.js

@@ -58,7 +58,7 @@ function getArrowPoints(fromX, fromY, toX, toY, arrowAngle) {
   if (length <= 20) {
     return;
   }
-  var arrowLength = Math.min(Math.floor(length / 3), 30);
+  var arrowLength = Math.min(Math.floor(length / 3), 10);
   // 计算单位方向向量
   var normalizedDirectionX = dx / length;
   var normalizedDirectionY = dy / length;

package/lib/core/echarts.js

@@ -1009,7 +1009,7 @@ var ECharts = /** @class */function (_super) {
     });
     // Extra events
     // TODO register?
-    each(['selectchanged', 'selectitem', 'loadmore', 'zoomend', 'visiblechanged'], function (eventType) {
+    each(['selectchanged', 'selectitem', 'loadmore', 'zoomend', 'visiblechanged', 'dataappend'], function (eventType) {
       _this._messageCenter.on(eventType, function (event) {
         this.trigger(eventType, event);
       }, _this);
@@ -1418,27 +1418,17 @@ var ECharts = /** @class */function (_super) {
         updateMethods.update.call(chart, isAdd ? {
           type: 'dataZoom'
         } : void 0);
+        if (isAdd) {
+          chart._messageCenter.trigger('dataappend');
+        }
       });
     } else {
-      var xAxisModal = this._model.getComponent('xAxis', 0);
-      var scale = xAxisModal.axis.scale;
-      var ordinalMeta = scale.getOrdinalMeta();
-      var lastTime = ordinalMeta.getLastCategories();
-      var isMove = isAdd && scale.lastBarRightSideDiffBarCount < 1.5 && lastTime !== time;
-      // if (isAdd && lastTime !== time) {
-      //     ordinalMeta.appendData([time]);
-      // }
-      if (isMove) {
-        var payload = {
-          type: 'dataZoom',
-          barSpace: scale.barSpace,
-          lastBarRightSideDiffBarCount: scale.lastBarRightSideDiffBarCount - 1,
-          isPushSync: true
-        };
-        doDispatchAction.call(this, payload, false);
-        return;
+      updateMethods.update.call(this, isAdd ? {
+        type: 'dataZoom'
+      } : void 0);
+      if (isAdd) {
+        this._messageCenter.trigger('dataappend');
       }
-      updateMethods.update.call(this);
     }
   };
   ECharts.prototype.scrollByDistance = function (distance, animationDuration) {

package/lib/data/scale-time/default-tick-mark-formatter.js

@@ -45,9 +45,12 @@ export function weightToTickMarkType(weight, timeVisible, secondsVisible) {
   }
 }
 
-export function defaultTickMarkFormatter(timePoint, tickMarkType, locale) {
+export function defaultTickMarkFormatter(timePoint, tickMarkType, locale, timeZone) {
+  if (timeZone === void 0) {
+    timeZone = 'Asia/Shanghai';
+  }
   var formatOptions = {
-    timeZone: 'Asia/Shanghai'
+    timeZone: timeZone
   };
   switch (tickMarkType) {
     case 0 /* Year */:

package/lib/data/scale-time/time-scale-point-weight-generator.js

@@ -59,23 +59,22 @@ var intradayWeightDivisors = [{
 }];
 // 服务端转换了本地时间 先用本地时间处理
 function weightByTime(currentDate, prevDate) {
-  // if (currentDate.getUTCFullYear() !== prevDate.getUTCFullYear()) {
+  if (currentDate.getUTCFullYear() !== prevDate.getUTCFullYear()) {
+    return 70 /* Year */;
+  } else if (currentDate.getUTCMonth() !== prevDate.getUTCMonth()) {
+    return 60 /* Month */;
+  } else if (currentDate.getUTCDate() !== prevDate.getUTCDate()) {
+    return 50 /* Day */;
+  }
+  // if (currentDate.getFullYear() !== prevDate.getFullYear()) {
   // 	return TickMarkWeight.Year;
   // }
-  // else if (currentDate.getUTCMonth() !== prevDate.getUTCMonth()) {
+  // else if (currentDate.getMonth() !== prevDate.getMonth()) {
   // 	return TickMarkWeight.Month;
   // }
-  // else if (currentDate.getUTCDate() !== prevDate.getUTCDate()) {
+  // else if (currentDate.getDate() !== prevDate.getDate()) {
   // 	return TickMarkWeight.Day;
   // }
-  if (currentDate.getFullYear() !== prevDate.getFullYear()) {
-    return 70 /* Year */;
-  } else if (currentDate.getMonth() !== prevDate.getMonth()) {
-    return 60 /* Month */;
-  } else if (currentDate.getDate() !== prevDate.getDate()) {
-    return 50 /* Day */;
-  }
-
   for (var i = intradayWeightDivisors.length - 1; i >= 0; --i) {
     if (Math.floor(prevDate.getTime() / intradayWeightDivisors[i].divisor) !== Math.floor(currentDate.getTime() / intradayWeightDivisors[i].divisor)) {
       return intradayWeightDivisors[i].weight;

package/package.json

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

package/types/src/data/scale-time/default-tick-mark-formatter.d.ts

@@ -1,3 +1,3 @@
 import { TickMarkType, TimePoint, TickMarkWeight } from './types.js';
 export declare function weightToTickMarkType(weight: TickMarkWeight, timeVisible: boolean, secondsVisible: boolean): TickMarkType;
-export declare function defaultTickMarkFormatter(timePoint: TimePoint, tickMarkType: TickMarkType, locale: string): string;
+export declare function defaultTickMarkFormatter(timePoint: TimePoint, tickMarkType: TickMarkType, locale: string, timeZone?: string): string;