evui 3.4.148 → 3.4.150

package/dist/evui.common.js

@@ -11227,7 +11227,7 @@ var update = add("9519e5b6", content, true, {"sourceMap":false,"shadowMode":fals
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.148\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.150\"}");
 
 /***/ }),
 
@@ -14958,6 +14958,22 @@ addToUnscopables('values');
 addToUnscopables('entries');
 
 
+/***/ }),
+
+/***/ "e285":
+/***/ (function(module, exports, __webpack_require__) {
+
+var global = __webpack_require__("da84");
+
+var globalIsFinite = global.isFinite;
+
+// `Number.isFinite` method
+// https://tc39.github.io/ecma262/#sec-number.isfinite
+module.exports = Number.isFinite || function isFinite(it) {
+  return typeof it == 'number' && globalIsFinite(it);
+};
+
+
 /***/ }),
 
 /***/ "e2cc":
@@ -15764,6 +15780,19 @@ module.exports = exports;
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "f00c":
+/***/ (function(module, exports, __webpack_require__) {
+
+var $ = __webpack_require__("23e7");
+var numberIsFinite = __webpack_require__("e285");
+
+// `Number.isFinite` method
+// https://tc39.github.io/ecma262/#sec-number.isfinite
+$({ target: 'Number', stat: true }, { isFinite: numberIsFinite });
+
+
 /***/ }),
 
 /***/ "f069":
@@ -38357,6 +38386,9 @@ function _createClass(Constructor, protoProps, staticProps) {
   if (staticProps) _defineProperties(Constructor, staticProps);
   return Constructor;
 }
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.is-finite.js
+var es_number_is_finite = __webpack_require__("f00c");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.entries.js
 var es_object_entries = __webpack_require__("4fad");
 
@@ -38910,6 +38942,8 @@ var textMeasureCtx = textMeasureCanvas.getContext('2d');
 
 
 
+
+
 
 
 
@@ -39128,21 +39162,42 @@ var modules = {
           this.dataSet[key].dataGroup[index].max = Math.max(this.dataSet[key].dataGroup[index].max, _item.y);
           this.dataSet[key].dataGroup[index].min = Math.min(this.dataSet[key].dataGroup[index].min, _item.y);
         }
-      }
+      } // 실제 차트에 그려지는 데이터(fromTime ~ toTime 범위)에서만 min/max 계산
+
 
       var tempMinMax = {
-        maxY: 0,
+        maxY: -Infinity,
         minY: Infinity
       };
+      var _this$dataSet$key = this.dataSet[key],
+          fromTime = _this$dataSet$key.fromTime,
+          toTime = _this$dataSet$key.toTime;
 
       for (var _i4 = 0; _i4 < this.dataSet[key].length; _i4++) {
-        if (this.dataSet[key].dataGroup[_i4].max > tempMinMax.maxY) {
-          tempMinMax.maxY = this.dataSet[key].dataGroup[_i4].max;
-        }
+        var groupData = this.dataSet[key].dataGroup[_i4].data;
+
+        for (var j = 0; j < groupData.length; j++) {
+          var _item2 = groupData[j]; // 현재 시간 범위 내의 데이터만 minMax 계산에 포함
 
-        if (this.dataSet[key].dataGroup[_i4].min < tempMinMax.minY) {
-          tempMinMax.minY = this.dataSet[key].dataGroup[_i4].min;
+          if (_item2.x >= fromTime && _item2.x <= toTime) {
+            if (_item2.y > tempMinMax.maxY) {
+              tempMinMax.maxY = _item2.y;
+            }
+
+            if (_item2.y < tempMinMax.minY) {
+              tempMinMax.minY = _item2.y;
+            }
+          }
         }
+      } // 유효한 데이터가 없는 경우 기본값 설정
+
+
+      if (!Number.isFinite(tempMinMax.maxY)) {
+        tempMinMax.maxY = 0;
+      }
+
+      if (!Number.isFinite(tempMinMax.minY)) {
+        tempMinMax.minY = 0;
       }
 
       minMaxValues.maxY = Math.max(minMaxValues.maxY, tempMinMax.maxY);
@@ -55420,11 +55475,7 @@ var chart_core_EvChart = /*#__PURE__*/function () {
   }, {
     key: "adjustXAndYAxisWidth",
     value: function adjustXAndYAxisWidth() {
-      var _this2 = this,
-          _this$axesRange,
-          _this$axesRange$x,
-          _this$axesRange2,
-          _this$axesRange2$y;
+      var _this2 = this;
 
       var getNotFormattedLabels = function getNotFormattedLabels(axesSteps, axisType, axis) {
         var _ref2 = axesSteps !== null && axesSteps !== void 0 ? axesSteps : {},
@@ -55468,42 +55519,51 @@ var chart_core_EvChart = /*#__PURE__*/function () {
         return result;
       };
 
-      var adjustedRange = {
-        x: (_this$axesRange = this.axesRange) === null || _this$axesRange === void 0 ? void 0 : (_this$axesRange$x = _this$axesRange.x) === null || _this$axesRange$x === void 0 ? void 0 : _this$axesRange$x.map(function (value, index) {
-          var _this2$axesSteps, _axis$labelStyle, _axis$getLabelWidthHa, _axis$getLabelWidthHa2;
-
-          var axis = _this2.axesX[index];
-          var axesSteps = (_this2$axesSteps = _this2.axesSteps) === null || _this2$axesSteps === void 0 ? void 0 : _this2$axesSteps.x[index];
-          var notFormattedLabels = getNotFormattedLabels(axesSteps, 'x', axis);
-          var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle = axis.labelStyle) === null || _axis$labelStyle === void 0 ? void 0 : _axis$labelStyle.fixWidth) ? axis.labelStyle.fixWidth : 0;
-          var maxWidth = (_axis$getLabelWidthHa = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa2 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa2 === void 0 ? void 0 : _axis$getLabelWidthHa2.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa !== void 0 ? _axis$getLabelWidthHa : 0;
-          return _objectSpread2(_objectSpread2({}, value), {}, {
-            size: {
-              width: fixWidth || Math.max(maxWidth, value.size.width),
-              height: value.size.height
-            }
-          });
-        }),
-        y: (_this$axesRange2 = this.axesRange) === null || _this$axesRange2 === void 0 ? void 0 : (_this$axesRange2$y = _this$axesRange2.y) === null || _this$axesRange2$y === void 0 ? void 0 : _this$axesRange2$y.map(function (value, index) {
-          var _this2$axesSteps2, _axis$labelStyle2, _axis$getLabelWidthHa3, _axis$getLabelWidthHa4;
-
-          var axis = _this2.axesY[index];
-          var axesSteps = (_this2$axesSteps2 = _this2.axesSteps) === null || _this2$axesSteps2 === void 0 ? void 0 : _this2$axesSteps2.y[index];
-          var notFormattedLabels = getNotFormattedLabels(axesSteps, 'y', axis);
-          var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle2 = axis.labelStyle) === null || _axis$labelStyle2 === void 0 ? void 0 : _axis$labelStyle2.fixWidth) ? axis.labelStyle.fixWidth : 0;
-          var maxWidth = (_axis$getLabelWidthHa3 = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa4 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa4 === void 0 ? void 0 : _axis$getLabelWidthHa4.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa3 !== void 0 ? _axis$getLabelWidthHa3 : 0;
-          return _objectSpread2(_objectSpread2({}, value), {}, {
-            size: {
-              width: fixWidth || Math.max(maxWidth, value.size.width),
-              height: value.size.height
-            }
-          });
-        })
+      var remeasureRange = function remeasureRange(currentRange) {
+        var _currentRange$x, _currentRange$y;
+
+        return {
+          x: currentRange === null || currentRange === void 0 ? void 0 : (_currentRange$x = currentRange.x) === null || _currentRange$x === void 0 ? void 0 : _currentRange$x.map(function (value, index) {
+            var _this2$axesSteps, _axis$labelStyle, _axis$getLabelWidthHa, _axis$getLabelWidthHa2;
+
+            var axis = _this2.axesX[index];
+            var axesSteps = (_this2$axesSteps = _this2.axesSteps) === null || _this2$axesSteps === void 0 ? void 0 : _this2$axesSteps.x[index];
+            var notFormattedLabels = getNotFormattedLabels(axesSteps, 'x', axis);
+            var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle = axis.labelStyle) === null || _axis$labelStyle === void 0 ? void 0 : _axis$labelStyle.fixWidth) ? axis.labelStyle.fixWidth : 0;
+            var maxWidth = (_axis$getLabelWidthHa = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa2 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa2 === void 0 ? void 0 : _axis$getLabelWidthHa2.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa !== void 0 ? _axis$getLabelWidthHa : 0;
+            return _objectSpread2(_objectSpread2({}, value), {}, {
+              size: {
+                width: fixWidth || Math.max(maxWidth, value.size.width),
+                height: value.size.height
+              }
+            });
+          }),
+          y: currentRange === null || currentRange === void 0 ? void 0 : (_currentRange$y = currentRange.y) === null || _currentRange$y === void 0 ? void 0 : _currentRange$y.map(function (value, index) {
+            var _this2$axesSteps2, _axis$labelStyle2, _axis$getLabelWidthHa3, _axis$getLabelWidthHa4;
+
+            var axis = _this2.axesY[index];
+            var axesSteps = (_this2$axesSteps2 = _this2.axesSteps) === null || _this2$axesSteps2 === void 0 ? void 0 : _this2$axesSteps2.y[index];
+            var notFormattedLabels = getNotFormattedLabels(axesSteps, 'y', axis);
+            var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle2 = axis.labelStyle) === null || _axis$labelStyle2 === void 0 ? void 0 : _axis$labelStyle2.fixWidth) ? axis.labelStyle.fixWidth : 0;
+            var maxWidth = (_axis$getLabelWidthHa3 = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa4 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa4 === void 0 ? void 0 : _axis$getLabelWidthHa4.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa3 !== void 0 ? _axis$getLabelWidthHa3 : 0;
+            return _objectSpread2(_objectSpread2({}, value), {}, {
+              size: {
+                width: fixWidth || Math.max(maxWidth, value.size.width),
+                height: value.size.height
+              }
+            });
+          })
+        };
       };
-      this.axesRange = adjustedRange;
-      this.labelOffset = this.getLabelOffset(adjustedRange);
+
+      this.axesRange = remeasureRange(this.axesRange);
+      this.labelOffset = this.getLabelOffset(this.axesRange);
       this.labelRange = this.getAxesLabelRange();
-      this.axesSteps = this.calculateSteps();
+      this.axesSteps = this.calculateSteps(); // 새로운 step 기준으로 라벨 너비를 다시 측정하여 잘림 방지
+      // TODO: 추후 개선 (3.4.200 이후 버전)
+
+      this.axesRange = remeasureRange(this.axesRange);
+      this.labelOffset = this.getLabelOffset(this.axesRange);
     }
     /**
      * To draw canvas chart, it processes several sequential jobs
@@ -56363,7 +56423,6 @@ var chart_core_EvChart = /*#__PURE__*/function () {
       this.axesRange = null;
       this.labelOffset = null;
       this.chartRect = null;
-      this.pieDataSet = [];
     }
     /**
      * Clear overlay canvas