evui 3.4.149 → 3.4.151

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.149\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.151\"}");
 
 /***/ }),
 
@@ -39044,18 +39044,17 @@ var modules = {
     };
 
     for (var x = 0; x < keys.length; x++) {
-      var _this$dataSet$key$dat, _this$dataSet$key$dat2, _this$dataSet$key$dat3;
+      var _dataGroup$at, _dataGroup$at$data, _dataGroup$at$data$at;
 
       var key = keys[x];
       var data = datas[key];
-      var storeLength = data === null || data === void 0 ? void 0 : data.length;
-      var lastTime = 0;
+      var storeLength = data === null || data === void 0 ? void 0 : data.length; // 1) init / updateSeries 시 dataset shape 보장
 
-      if (!this.isInit || this.updateSeries) {
+      if (!this.isInit || this.updateSeries || !this.dataSet[key]) {
         var defaultValues = {
           dataGroup: [],
           startIndex: 0,
-          endIndex: 0,
+          endIndex: null,
           length: 0,
           fromTime: 0,
           toTime: 0
@@ -39063,104 +39062,132 @@ var modules = {
         this.dataSet[key] = _objectSpread2(_objectSpread2({}, defaultValues), this.dataSet[key]);
       }
 
-      this.dataSet[key].length = this.options.realTimeScatter.range || 300;
+      var dataset = this.dataSet[key];
+      var dataGroup = dataset.dataGroup; // 2) range(length) 결정 + 변경 감지
+
+      var nextLength = this.options.realTimeScatter.range || 300;
+      var lengthChanged = dataset.length !== nextLength;
+      dataset.length = nextLength;
+      var length = dataset.length; // 3) 이번 배치의 lastTime(초 단위) 계산
+
+      var lastTime = 0;
 
       for (var i = 0; i < storeLength; i++) {
         var item = data[i];
 
-        if (lastTime < item.x) {
+        if (item && lastTime < item.x) {
           lastTime = item.x;
         }
       }
 
-      lastTime = Math.floor(lastTime / 1000) * 1000;
-      var dataGroupLastTime = ((_this$dataSet$key$dat = this.dataSet[key].dataGroup.at(-1)) === null || _this$dataSet$key$dat === void 0 ? void 0 : (_this$dataSet$key$dat2 = _this$dataSet$key$dat.data) === null || _this$dataSet$key$dat2 === void 0 ? void 0 : (_this$dataSet$key$dat3 = _this$dataSet$key$dat2.at(-1)) === null || _this$dataSet$key$dat3 === void 0 ? void 0 : _this$dataSet$key$dat3.x) || Date.now();
-      this.dataSet[key].toTime = lastTime || (dataGroupLastTime ? Math.floor(dataGroupLastTime / 1000) * 1000 : 0);
-      this.dataSet[key].fromTime = this.dataSet[key].toTime - this.dataSet[key].length * 1000;
-      this.dataSet[key].endIndex = this.dataSet[key].length - 1;
+      lastTime = lastTime ? Math.floor(lastTime / 1000) * 1000 : 0;
+      var dataGroupLastTime = ((_dataGroup$at = dataGroup.at(-1)) === null || _dataGroup$at === void 0 ? void 0 : (_dataGroup$at$data = _dataGroup$at.data) === null || _dataGroup$at$data === void 0 ? void 0 : (_dataGroup$at$data$at = _dataGroup$at$data.at(-1)) === null || _dataGroup$at$data$at === void 0 ? void 0 : _dataGroup$at$data$at.x) || Date.now();
+      var fallbackTime = Math.floor(dataGroupLastTime / 1000) * 1000; // 4) prevToTime은 덮기 전 값 (없으면 fallback)
 
-      if ((this.dataSet[key].toTime - lastTime) / 1000 > this.dataSet[key].length && key === '') {
-        return;
-      }
+      var prevToTime = dataset.toTime || fallbackTime; // 5) nextToTime 결정: 새 데이터가 있으면 lastTime, 없으면 이전 유지
 
-      var gapCount = (lastTime - this.dataSet[key].toTime) / 1000;
+      var nextToTime = lastTime || prevToTime; // 6) endIndex/startIndex 초기화 (최초 1회) + length 변경 시 재구성
 
-      if (gapCount > 0) {
-        this.dataSet[key].toTime = lastTime;
-        this.dataSet[key].fromTime = lastTime - this.dataSet[key].length * 1000;
-      }
+      if (dataset.endIndex == null || lengthChanged) {
+        dataset.startIndex = 0;
+        dataset.endIndex = length - 1; // dataGroup 크기 맞추고 모두 reset
 
-      for (var _i = 0; _i < this.dataSet[key].length; _i++) {
-        var _defaultValues = {
-          data: [],
-          max: 0,
-          min: Infinity
-        };
-        this.dataSet[key].dataGroup[_i] = _objectSpread2(_objectSpread2({}, _defaultValues), this.dataSet[key].dataGroup[_i]);
+        dataGroup.length = length;
+
+        for (var _i = 0; _i < length; _i++) {
+          dataGroup[_i] = dataGroup[_i] || {
+            data: [],
+            max: 0,
+            min: Infinity
+          };
+          dataGroup[_i].data.length = 0;
+          dataGroup[_i].max = 0;
+          dataGroup[_i].min = Infinity;
+        } // toTime/fromTime도 새 기준으로 맞춤
+
+
+        dataset.toTime = nextToTime;
+        dataset.fromTime = dataset.toTime - length * 1000;
+      } // 7) gapCount 계산 (반드시 정수) — prevToTime 기준
+
+
+      var rawGap = (nextToTime - prevToTime) / 1000;
+      var gapCount = Number.isFinite(rawGap) ? Math.max(0, Math.floor(rawGap)) : 0; // 8) to/from 갱신
+
+      dataset.toTime = nextToTime;
+      dataset.fromTime = dataset.toTime - length * 1000; // (원래 코드에 있던 early return 유지)
+
+      if (lastTime && (dataset.toTime - lastTime) / 1000 > length && key === '') {
+        return;
       }
 
-      if (gapCount > 0) {
-        if (gapCount >= this.dataSet[key].length) {
-          for (var _i2 = 0; _i2 < this.dataSet[key].length; _i2++) {
-            this.dataSet[key].dataGroup[_i2].data.length = 0;
-            this.dataSet[key].dataGroup[_i2].max = 0;
-            this.dataSet[key].dataGroup[_i2].min = Infinity;
-          }
+      var resetDataGroup = function resetDataGroup(group) {
+        group.data.length = 0;
+        group.max = 0;
+        group.min = Infinity;
+      }; // 9) dataGroup 슬롯 확보
 
-          this.dataSet[key].startIndex = 0;
-          this.dataSet[key].endIndex = this.dataSet[key].length - 1;
-        } else {
-          while (gapCount > 0) {
-            if (this.dataSet[key].dataGroup[this.dataSet[key].startIndex] === null) {
-              this.dataSet[key].dataGroup[this.dataSet[key].startIndex] = {
-                data: [],
-                max: 0,
-                min: Infinity
-              };
-            } else {
-              this.dataSet[key].dataGroup[this.dataSet[key].startIndex].data.length = 0;
-              this.dataSet[key].dataGroup[this.dataSet[key].startIndex].max = 0;
-              this.dataSet[key].dataGroup[this.dataSet[key].startIndex].min = Infinity;
-            }
 
-            ++this.dataSet[key].startIndex;
+      for (var _i2 = 0; _i2 < length; _i2++) {
+        if (!dataGroup[_i2]) {
+          dataGroup[_i2] = {
+            data: [],
+            max: 0,
+            min: Infinity
+          };
+        } else if (!dataGroup[_i2].data) {
+          dataGroup[_i2].data = [];
+          dataGroup[_i2].max = 0;
+          dataGroup[_i2].min = Infinity;
+        }
+      } // 10) gap만큼 링 전진 + 지나간 버킷 clear
 
-            if (this.dataSet[key].startIndex >= this.dataSet[key].length) {
-              this.dataSet[key].startIndex = 0;
-            }
 
-            ++this.dataSet[key].endIndex;
+      if (gapCount > 0) {
+        if (gapCount >= length) {
+          for (var _i3 = 0; _i3 < length; _i3++) {
+            resetDataGroup(dataGroup[_i3]);
+          }
 
-            if (this.dataSet[key].endIndex >= this.dataSet[key].length) {
-              this.dataSet[key].endIndex = 0;
-            }
+          dataset.startIndex = 0;
+          dataset.endIndex = length - 1;
+        } else {
+          var currentStart = dataset.startIndex;
+          var currentEnd = dataset.endIndex;
 
-            --gapCount;
+          for (var _i4 = 0; _i4 < gapCount; _i4++) {
+            resetDataGroup(dataGroup[currentStart]);
+            currentStart = (currentStart + 1) % length;
+            currentEnd = (currentEnd + 1) % length;
           }
+
+          dataset.startIndex = currentStart;
+          dataset.endIndex = currentEnd;
         }
-      }
+      } // 11) 데이터 push (윈도우 안에 들어오는 것만)
 
-      for (var _i3 = 0; _i3 < storeLength; _i3++) {
-        var _item = data[_i3];
-        var xAxisTime = Math.floor(_item.x / 1000) * 1000;
 
-        if (this.dataSet[key].fromTime <= xAxisTime) {
-          var _item$value;
+      for (var _i5 = 0; _i5 < storeLength; _i5++) {
+        var _item = data[_i5];
 
-          var index = this.dataSet[key].endIndex - (this.dataSet[key].toTime - xAxisTime) / 1000;
+        if (_item) {
+          var xAxisTime = Math.floor(_item.x / 1000) * 1000;
 
-          if (index < 0) {
-            index = this.dataSet[key].length + index;
-          }
+          if (dataset.fromTime <= xAxisTime) {
+            var _item$value;
 
-          this.dataSet[key].dataGroup[index].data.push({
-            x: _item.x,
-            y: _item.y,
-            o: (_item$value = _item.value) !== null && _item$value !== void 0 ? _item$value : _item.y,
-            color: _item.color
-          });
-          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);
+            var index = dataset.endIndex - (dataset.toTime - xAxisTime) / 1000;
+            if (index < 0) index = length + index;
+            var group = dataGroup[index];
+            group.data.push({
+              x: _item.x,
+              y: _item.y,
+              o: (_item$value = _item.value) !== null && _item$value !== void 0 ? _item$value : _item.y,
+              color: _item.color
+            });
+            group.max = Math.max(group.max, _item.y);
+            group.min = Math.min(group.min, _item.y);
+          }
         }
       } // 실제 차트에 그려지는 데이터(fromTime ~ toTime 범위)에서만 min/max 계산
 
@@ -39169,12 +39196,11 @@ var modules = {
         maxY: -Infinity,
         minY: Infinity
       };
-      var _this$dataSet$key = this.dataSet[key],
-          fromTime = _this$dataSet$key.fromTime,
-          toTime = _this$dataSet$key.toTime;
+      var fromTime = dataset.fromTime,
+          toTime = dataset.toTime;
 
-      for (var _i4 = 0; _i4 < this.dataSet[key].length; _i4++) {
-        var groupData = this.dataSet[key].dataGroup[_i4].data;
+      for (var _i6 = 0; _i6 < length; _i6++) {
+        var groupData = dataGroup[_i6].data;
 
         for (var j = 0; j < groupData.length; j++) {
           var _item2 = groupData[j]; // 현재 시간 범위 내의 데이터만 minMax 계산에 포함
@@ -39202,8 +39228,8 @@ var modules = {
 
       minMaxValues.maxY = Math.max(minMaxValues.maxY, tempMinMax.maxY);
       minMaxValues.minY = Math.min(minMaxValues.minY, tempMinMax.minY);
-      minMaxValues.fromTime = this.dataSet[key].fromTime;
-      minMaxValues.toTime = this.dataSet[key].toTime;
+      minMaxValues.fromTime = dataset.fromTime;
+      minMaxValues.toTime = dataset.toTime;
     }
 
     this.seriesInfo.charts.scatter.forEach(function (seriesID) {
@@ -55475,11 +55501,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 : {},
@@ -55523,42 +55545,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