evui 3.4.124 → 3.4.125

package/dist/evui.common.js

@@ -11174,7 +11174,7 @@ module.exports = exports;
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.124\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.125\"}");
 
 /***/ }),
 
@@ -45411,9 +45411,6 @@ var scale_Scale = /*#__PURE__*/function () {
           var mergedPlotLineOpt = lodash_es_defaultsDeep({}, plotLine, PLOT_LINE_OPTION);
           var value = mergedPlotLineOpt.value,
               labelOpt = mergedPlotLineOpt.label;
-
-          _this3.setPlotLineStyle(mergedPlotLineOpt);
-
           var dataPos;
 
           if (_this3.type === 'x') {
@@ -45423,6 +45420,8 @@ var scale_Scale = /*#__PURE__*/function () {
               return;
             }
 
+            _this3.setPlotLineStyle(mergedPlotLineOpt);
+
             _this3.drawXPlotLine(dataPos, minX, maxX, minY, maxY);
           } else {
             dataPos = helpers_canvas.calculateY(value, axisMin, axisMax, yArea, maxY);
@@ -45431,6 +45430,8 @@ var scale_Scale = /*#__PURE__*/function () {
               return;
             }
 
+            _this3.setPlotLineStyle(mergedPlotLineOpt);
+
             _this3.drawYPlotLine(dataPos, minX, maxX, minY, maxY);
           }
 
@@ -46783,9 +46784,7 @@ var scale_time_category_TimeCategoryScale = /*#__PURE__*/function (_Scale) {
       var axisMin = stepInfo.graphMin;
       var axisMax = stepInfo.graphMax;
       var stepValue = stepInfo.rawInterval;
-      var oriSteps = stepInfo.oriSteps; // 2개 이하일 경우, 첫번째와 마지막 라벨만 표시
-
-      var count = steps <= 2 ? oriSteps : Math.round(oriSteps / steps);
+      var oriSteps = stepInfo.oriSteps;
       var startPoint = aPos[this.units.rectStart];
       var endPoint = aPos[this.units.rectEnd];
       var offsetPoint = aPos[this.units.rectOffset(this.position)];
@@ -46837,8 +46836,18 @@ var scale_time_category_TimeCategoryScale = /*#__PURE__*/function (_Scale) {
       ctx.strokeStyle = this.gridLineColor;
       var labelText;
       var labelPoint;
-      var ix;
-      var maxIndex = oriSteps === count ? oriSteps : oriSteps - 1;
+      var ix; // 2개 이하일 경우, 첫번째와 마지막 라벨만 표시
+
+      var count = steps <= 2 ? oriSteps : Math.round(oriSteps / steps); // 첫번째 라벨이 축 시작점보다 오른쪽에 있을 경우, count를 1로 설정
+      // 추후 개선 필요: 근본적 문제는 라벨이 2개인 경우 oriSteps가 1로 와야하는데 2로 옴. horizontal일 때 예외처리 필요.
+
+      var isStartPointRightOfRectStart = startPoint > Math.ceil(aPos[this.units.rectStart]);
+
+      if (this.type === 'x' && isStartPointRightOfRectStart && count === oriSteps) {
+        count = 1;
+      }
+
+      var maxIndex = count === oriSteps ? oriSteps : oriSteps - 1;
 
       var _loop = function _loop() {
         var _this2$options, _this2$options$select, _this2$options2, _this2$options2$selec, _selectLabelInfo$data;
@@ -46899,7 +46908,7 @@ var scale_time_category_TimeCategoryScale = /*#__PURE__*/function (_Scale) {
             }
           }
 
-          if (ix !== 0 && ix < oriSteps && _this2.showGrid) {
+          if (ix < oriSteps && _this2.showGrid && (isStartPointRightOfRectStart || !isStartPointRightOfRectStart && ix !== 0)) {
             ctx.moveTo(linePosition, offsetPoint);
             ctx.lineTo(linePosition, offsetCounterPoint);
           }
@@ -46907,7 +46916,7 @@ var scale_time_category_TimeCategoryScale = /*#__PURE__*/function (_Scale) {
           labelPoint = _this2.position === 'left' ? offsetPoint - 10 : offsetPoint + 10;
           ctx.fillText(labelText, labelPoint, labelCenter);
 
-          if (ix !== 0 && ix < oriSteps && _this2.showGrid) {
+          if (ix < oriSteps && _this2.showGrid && (isStartPointRightOfRectStart || !isStartPointRightOfRectStart && ix !== 0)) {
             ctx.moveTo(offsetPoint, linePosition);
             ctx.lineTo(offsetCounterPoint, linePosition);
           }