evui 3.3.28 → 3.3.29

package/dist/evui.common.js

@@ -7940,7 +7940,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.3.28\"}");
+module.exports = JSON.parse("{\"a\":\"3.3.29\"}");
 
 /***/ }),
 
@@ -34473,7 +34473,8 @@ var AXIS_OPTION = {
     fontFamily: 'Roboto',
     fontWeight: 400,
     fitWidth: false,
-    fitDir: 'right'
+    fitDir: 'right',
+    alignToGridLine: false
   },
   title: {
     use: false,
@@ -37494,7 +37495,11 @@ var scale_Scale = /*#__PURE__*/function () {
       numberOfSteps = Math.round(graphRange / interval);
 
       if (maxValue === 1) {
-        if (maxSteps > 2) {
+        if (!this.decimalPoint) {
+          interval = 1;
+          numberOfSteps = 1;
+          maxSteps = 1;
+        } else if (maxSteps > 2) {
           interval = 0.2;
           numberOfSteps = 5;
           maxSteps = 5;
@@ -38539,6 +38544,7 @@ var scale_logarithmic_LogarithmicScale = /*#__PURE__*/function (_Scale) {
 
 
 
+
 var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
   _inherits(StepScale, _Scale);
 
@@ -38565,7 +38571,7 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
   _createClass(StepScale, [{
     key: "calculateScaleRange",
     value: function calculateScaleRange(minMax, chartRect) {
-      var stepMinMax = this.rangeMode ? minMax : helpers_util.getStringMinMax(this.labels);
+      var stepMinMax = this.labelStyle.alignToGridLine ? minMax : helpers_util.getStringMinMax(this.labels);
       var maxValue = stepMinMax.max;
       var minValue = stepMinMax.min;
       var maxWidth = chartRect.chartWidth / (this.labels.length + 2);
@@ -38589,8 +38595,11 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
     value: function calculateSteps(range) {
       var numberOfSteps = this.labels.length;
       var interval = 1;
+      var isNumbersArray = this.labels.every(function (label) {
+        return !isNaN(label);
+      });
 
-      if (this.rangeMode) {
+      if (this.labelStyle.alignToGridLine && isNumbersArray) {
         var maxSteps = range.maxSteps;
 
         if (maxSteps > 2) {
@@ -38678,6 +38687,7 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
         }
 
         var labelGap = (endPoint - startPoint) / labels.length;
+        var alignToGridLine = this.labelStyle.alignToGridLine;
         var labelCenter = null;
         var linePosition = null;
         ctx.beginPath();
@@ -38707,7 +38717,7 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
             var _this$options3, _this$options3$select, _this$options4;
 
             labelPoint = this.position === 'top' ? offsetPoint - 10 : offsetPoint + 10;
-            var xPoint = this.rangeMode ? labelCenter : labelCenter + labelGap / 2;
+            var xPoint = alignToGridLine ? labelCenter : labelCenter + labelGap / 2;
             ctx.fillText(labelText, xPoint, labelPoint);
 
             if (!isBlurredLabel && (_this$options3 = this.options) !== null && _this$options3 !== void 0 && (_this$options3$select = _this$options3.selectItem) !== null && _this$options3$select !== void 0 && _this$options3$select.showLabelTip && hitInfo !== null && hitInfo !== void 0 && hitInfo.label && !((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.horizontal)) {
@@ -38738,7 +38748,7 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
             }
           } else {
             labelPoint = this.position === 'left' ? offsetPoint - 10 : offsetPoint + 10;
-            var yPoint = this.rangeMode ? labelCenter : labelCenter + labelGap / 2;
+            var yPoint = alignToGridLine ? labelCenter : labelCenter + labelGap / 2;
             ctx.fillText(labelText, labelPoint, yPoint);
 
             if (index > 0 && this.showGrid) {
@@ -38750,7 +38760,7 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
           ctx.stroke();
         }
 
-        if (this.rangeMode && index === this.labels.length) {
+        if (alignToGridLine && index === this.labels.length) {
           var labelLastText = +labels[labels.length - 1] + (+labels[1] - +labels[0]);
 
           if (isNaN(labelLastText)) {
@@ -39091,9 +39101,10 @@ var scale_time_category_TimeCategoryScale = /*#__PURE__*/function (_Scale) {
         return;
       }
 
+      var alignToGridLine = this.labelStyle.alignToGridLine;
       var graphGap = (endPoint - startPoint) / (labels.length || 1);
 
-      if (this.categoryMode && !this.rangeMode) {
+      if (this.categoryMode && !alignToGridLine) {
         startPoint += Math.ceil(graphGap / 2) - 2;
       }
 
@@ -39167,7 +39178,7 @@ var scale_time_category_TimeCategoryScale = /*#__PURE__*/function (_Scale) {
         ctx.stroke();
       }
 
-      if (this.categoryMode && this.rangeMode && count * steps === oriSteps) {
+      if (this.categoryMode && alignToGridLine && count * steps === oriSteps) {
         var diffTime = dayjs_min_default()(labels[1]).diff(dayjs_min_default()(labels[0]));
         var labelLastText = this.getLabelFormat(dayjs_min_default()(labels[labels.length - 1] + diffTime));
         labelCenter = Math.round(startPoint + graphGap * labels.length);
@@ -39784,6 +39795,8 @@ var plugins_legend_modules = {
     while (legendDOM.hasChildNodes()) {
       legendDOM.removeChild(legendDOM.firstChild);
     }
+
+    this.seriesInfo.count = 0;
   },
 
   /**
@@ -41437,8 +41450,7 @@ var plugins_interaction_modules = {
         item.data.formatted = this.getFormattedTooltipValue({
           seriesName: series.name,
           value: hasData.o,
-          x: hasData.x,
-          y: hasData.y
+          itemData: hasData
         });
         hitInfo.items[sId] = item;
       }