evui 3.4.132 → 3.4.133

package/dist/evui.common.js

@@ -11216,7 +11216,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.132\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.133\"}");
 
 /***/ }),
 
@@ -42090,7 +42090,7 @@ var element_line_Line = /*#__PURE__*/function () {
               item.hit = true;
             }
           }
-        } else if (typeof this.beforeFindItemIndex === 'number' && this.show && useSelectLabelOrItem) {
+        } else if (typeof this.beforeFindItemIndex === 'number' && this.beforeFindItemIndex !== -1 && this.show && useSelectLabelOrItem) {
           item.data = gdata[this.beforeFindItemIndex];
           item.index = this.beforeFindItemIndex;
         } else {
@@ -42194,30 +42194,29 @@ var element_line_Line = /*#__PURE__*/function () {
             } // 두 가지 임계값 설정
 
 
-            var strictThreshold = avgInterval * 0.3; // 엄격한 임계값: 데이터 간격의 30%
+            var threshold = Math.max(avgInterval, 1); // 1. 먼저 엄격한 임계값으로 정확한 매치 확인
 
-            var relaxedThreshold = avgInterval; // 느슨한 임계값: 데이터 간격 전체
-            // 1. 먼저 엄격한 임계값으로 정확한 매치 확인
-
-            if (closestXDistance <= strictThreshold) {
+            if (closestXDistance <= threshold) {
               // 정확히 일치하거나 매우 가까운 데이터가 있음
               item.data = gdata[closestIndex];
               item.index = closestIndex;
             } else {
-              // 2. 정확한 매치가 없을 때, 현재 X 위치 근처에 다른 유효 데이터가 있는지 확인
-              var hasNearbyValidData = false;
-
-              for (var _i2 = 0; _i2 < validData.length; _i2++) {
-                var xDist = Math.abs(xp - validData[_i2].xp);
-
-                if (xDist <= strictThreshold) {
-                  hasNearbyValidData = true;
-                  break;
+              // 2. 정확한 매치가 없을 때, 현재 X 위치 근처에 다른 데이터가 있는지 확인
+              var hasNearbyAnyData = false;
+              var closestDistance = isLinearInterpolation ? Infinity : threshold;
+              var dataSet = isLinearInterpolation ? validData : gdata;
+
+              for (var _i2 = 0; _i2 < dataSet.length; _i2++) {
+                var xDist = Math.abs(xp - dataSet[_i2].xp);
+
+                if (xDist <= closestDistance) {
+                  hasNearbyAnyData = true;
+                  closestDistance = xDist;
+                  closestIndex = isLinearInterpolation ? dataSet[_i2].originalIndex : _i2;
                 }
-              } // 3. 근처에 다른 유효 데이터가 없을 때만 느슨한 임계값 적용
-
+              }
 
-              if (!hasNearbyValidData && closestXDistance <= relaxedThreshold) {
+              if (hasNearbyAnyData) {
                 item.data = gdata[closestIndex];
                 item.index = closestIndex;
               }
@@ -50850,6 +50849,7 @@ function inRange_inRange(number, start, end) {
 
 
 
+
 
 
 var plugins_interaction_modules = {
@@ -51213,7 +51213,7 @@ var plugins_interaction_modules = {
       };
 
       var setSelectedLabelInfo = function setSelectedLabelInfo(targetAxis) {
-        var itemHitInfo = _this.getItemByPosition(offset, false);
+        var _this$defaultSelectIn, _this$defaultSelectIn2, _this$defaultSelectIn3, _this$defaultSelectIn4;
 
         var _this$getLabelInfoByP2 = _this.getLabelInfoByPosition(offset, targetAxis),
             clickedLabelIndex = _this$getLabelInfoByP2.labelIndex;
@@ -51230,8 +51230,8 @@ var plugins_interaction_modules = {
         args.selected = _objectSpread2({
           eventTarget: 'label'
         }, lodash_es_cloneDeep(_this.defaultSelectInfo));
-        args.label = itemHitInfo.label;
-        args.dataIndex = itemHitInfo.maxIndex;
+        args.label = (_this$defaultSelectIn = _this.defaultSelectInfo) === null || _this$defaultSelectIn === void 0 ? void 0 : (_this$defaultSelectIn2 = _this$defaultSelectIn.label) === null || _this$defaultSelectIn2 === void 0 ? void 0 : _this$defaultSelectIn2.at(0);
+        args.dataIndex = (_this$defaultSelectIn3 = _this.defaultSelectInfo) === null || _this$defaultSelectIn3 === void 0 ? void 0 : (_this$defaultSelectIn4 = _this$defaultSelectIn3.dataIndex) === null || _this$defaultSelectIn4 === void 0 ? void 0 : _this$defaultSelectIn4.at(0);
       };
 
       var setSelectedSeriesInfo = function setSelectedSeriesInfo() {
@@ -51865,77 +51865,11 @@ var plugins_interaction_modules = {
     var maxsw = 0;
     var maxv = '';
     var maxg = null;
-    var maxSID = null; // 파이 차트는 특별한 처리가 필요
-
-    if (this.options.type === 'pie') {
-      for (var ix = 0; ix < sIds.length; ix++) {
-        var sId = sIds[ix];
-        var series = this.seriesList[sId];
-
-        if (series.findGraphData && series.show) {
-          var item = series.findGraphData(offset);
-
-          if (item !== null && item !== void 0 && item.data && item.hit) {
-            var gdata = item.data.o;
-
-            if (gdata !== null && gdata !== undefined) {
-              var formattedSeriesName = this.getFormattedTooltipLabel({
-                dataId: series.id,
-                seriesId: sId,
-                seriesName: series.name,
-                itemData: item.data
-              });
-              var sw = ctx ? ctx.measureText(formattedSeriesName).width : 1;
-              item.id = series.id;
-              item.name = formattedSeriesName;
-              item.axis = {
-                x: 0,
-                y: 0
-              };
-              items[sId] = item;
-              var formattedTxt = this.getFormattedTooltipValue({
-                dataId: series.id,
-                seriesId: sId,
-                seriesName: formattedSeriesName,
-                value: gdata,
-                itemData: item.data
-              });
-              item.data.formatted = formattedTxt;
-
-              if (maxsw < sw) {
-                maxs = formattedSeriesName;
-                maxsw = sw;
-              }
-
-              if (maxv.length <= "".concat(formattedTxt).length) {
-                maxv = "".concat(formattedTxt);
-              }
-
-              if (maxg === null || maxg <= gdata) {
-                maxg = gdata;
-                maxSID = sId;
-              }
-
-              hitId = sId;
-            }
-          }
-        }
-      }
-
-      var _maxHighlight2 = maxg !== null ? [maxSID, maxg] : null;
-
-      return {
-        items: items,
-        hitId: hitId,
-        maxTip: [maxs, maxv],
-        maxHighlight: _maxHighlight2
-      };
-    } // 1. 먼저 공통으로 사용할 데이터 인덱스 결정
-
+    var maxSID = null; // 1. 먼저 공통으로 사용할 데이터 인덱스 결정
 
     var targetDataIndex = this.findClosestDataIndex(offset, sIds);
 
-    if (targetDataIndex === -1) {
+    if (targetDataIndex === -1 && this.options.type !== 'pie') {
       return {
         items: items,
         hitId: hitId,
@@ -51949,69 +51883,65 @@ var plugins_interaction_modules = {
       return _this4.seriesList[sId].type === 'bar';
     });
 
-    for (var _ix = 0; _ix < sIds.length; _ix++) {
-      var _sId = sIds[_ix];
-      var _series = this.seriesList[_sId];
+    for (var ix = 0; ix < sIds.length; ix++) {
+      var sId = sIds[ix];
+      var series = this.seriesList[sId];
 
-      if (_series.findGraphData && _series.show) {
+      if (series.findGraphData && series.show) {
         // 특정 데이터 인덱스로 데이터 요청
-        var _item = _series.findGraphData(offset, isHorizontal, targetDataIndex, !allSeriesIsBar);
+        var item = series.findGraphData(offset, isHorizontal, targetDataIndex, !allSeriesIsBar);
 
-        if (_item !== null && _item !== void 0 && _item.data) {
-          var _gdata = void 0;
+        if (item !== null && item !== void 0 && item.data) {
+          var gdata = void 0;
 
-          if (_item.data.o === null && _series.interpolation !== 'zero') {
-            if (!_series.isExistGrp) {
-              _gdata = isHorizontal ? _item.data.x : _item.data.y;
+          if (item.data.o === null && series.interpolation !== 'zero') {
+            if (!series.isExistGrp) {
+              gdata = isHorizontal ? item.data.x : item.data.y;
             }
-          } else if (!isNaN(_item.data.o)) {
-            _gdata = _item.data.o;
+          } else if (!isNaN(item.data.o)) {
+            gdata = item.data.o;
           }
 
-          if (_gdata !== null && _gdata !== undefined) {
-            var _formattedSeriesName = this.getFormattedTooltipLabel({
-              dataId: _series.id,
-              seriesId: _sId,
-              seriesName: _series.name,
-              itemData: _item.data
+          if (gdata !== null && gdata !== undefined) {
+            var formattedSeriesName = this.getFormattedTooltipLabel({
+              dataId: series.id,
+              seriesId: sId,
+              seriesName: series.name,
+              itemData: item.data
             });
-
-            var _sw = ctx ? ctx.measureText(_formattedSeriesName).width : 1;
-
-            _item.id = _series.id;
-            _item.name = _formattedSeriesName;
-            _item.axis = {
-              x: _series.xAxisIndex,
-              y: _series.yAxisIndex
+            var sw = ctx ? ctx.measureText(formattedSeriesName).width : 1;
+            item.id = series.id;
+            item.name = formattedSeriesName;
+            item.axis = {
+              x: series.xAxisIndex,
+              y: series.yAxisIndex
             };
-            items[_sId] = _item;
-
-            var _formattedTxt = this.getFormattedTooltipValue({
-              dataId: _series.id,
-              seriesId: _sId,
-              seriesName: _formattedSeriesName,
-              value: _gdata,
-              itemData: _item.data
+            items[sId] = item;
+            var formattedTxt = this.getFormattedTooltipValue({
+              dataId: series.id,
+              seriesId: sId,
+              seriesName: formattedSeriesName,
+              value: gdata,
+              itemData: item.data
             });
+            item.data.formatted = formattedTxt;
 
-            _item.data.formatted = _formattedTxt;
-
-            if (maxsw < _sw) {
-              maxs = _formattedSeriesName;
-              maxsw = _sw;
+            if (maxsw < sw) {
+              maxs = formattedSeriesName;
+              maxsw = sw;
             }
 
-            if (maxv.length <= "".concat(_formattedTxt).length) {
-              maxv = "".concat(_formattedTxt);
+            if (maxv.length <= "".concat(formattedTxt).length) {
+              maxv = "".concat(formattedTxt);
             }
 
-            if (maxg === null || maxg <= _gdata) {
-              maxg = _gdata;
-              maxSID = _sId;
+            if (maxg === null || maxg <= gdata) {
+              maxg = gdata;
+              maxSID = sId;
             }
 
-            if (_item.hit) {
-              hitId = _sId;
+            if (item.hit) {
+              hitId = sId;
             }
           }
         }
@@ -52036,16 +51966,17 @@ var plugins_interaction_modules = {
    */
   findClosestDataIndex: function findClosestDataIndex(offset, sIds) {
     var _this5 = this,
-        _this$seriesList$refe;
+        _this$seriesList$refe,
+        _this$seriesList,
+        _this$seriesList$refe2,
+        _this$seriesList$refe3;
 
     var _offset = _slicedToArray(offset, 2),
         xp = _offset[0],
         yp = _offset[1];
 
     var isHorizontal = !!this.options.horizontal;
-    var mousePos = isHorizontal ? yp : xp;
-    var closestDistance = Infinity;
-    var closestIndex = -1; // 첫 번째 표시 중인 시리즈를 기준으로 라벨 위치 확인
+    var mousePos = isHorizontal ? yp : xp; // 첫 번째 표시 중인 시리즈를 기준으로 라벨 위치 확인
 
     var referenceSeries = sIds.find(function (sId) {
       var _this5$seriesList$sId;
@@ -52057,19 +51988,56 @@ var plugins_interaction_modules = {
       return -1;
     }
 
-    var referenceData = this.seriesList[referenceSeries].data; // 각 라벨에서 가장 가까운 것 찾기
+    var referenceData = this.seriesList[referenceSeries].data; // 데이터 간격 계산 - 모든 데이터(null 포함)의 평균 간격 사용
+
+    var avgInterval = 50;
+
+    if (referenceData.length > 1) {
+      var intervals = [];
+
+      for (var i = 1; i < referenceData.length; i++) {
+        var prevPoint = referenceData[i - 1];
+        var currPoint = referenceData[i];
+
+        if (prevPoint && currPoint) {
+          var prevPos = void 0;
+          var currPos = void 0;
+
+          if (isHorizontal) {
+            prevPos = prevPoint.h ? prevPoint.yp + prevPoint.h / 2 : prevPoint.yp;
+            currPos = currPoint.h ? currPoint.yp + currPoint.h / 2 : currPoint.yp;
+          } else {
+            prevPos = prevPoint.w ? prevPoint.xp + prevPoint.w / 2 : prevPoint.xp;
+            currPos = currPoint.w ? currPoint.xp + currPoint.w / 2 : currPoint.xp;
+          }
+
+          if (prevPos !== null && currPos !== null) {
+            intervals.push(Math.abs(currPos - prevPos));
+          }
+        }
+      }
+
+      if (intervals.length > 0) {
+        avgInterval = intervals.reduce(function (a, b) {
+          return a + b;
+        }, 0) / intervals.length;
+      }
+    }
+
+    var closestDistance = (_this$seriesList = this.seriesList) !== null && _this$seriesList !== void 0 && (_this$seriesList$refe2 = _this$seriesList[referenceSeries]) !== null && _this$seriesList$refe2 !== void 0 && (_this$seriesList$refe3 = _this$seriesList$refe2.useLinearInterpolation) !== null && _this$seriesList$refe3 !== void 0 && _this$seriesList$refe3.call(_this$seriesList$refe2) ? Infinity : avgInterval;
+    var closestIndex = -1; // 각 라벨에서 가장 가까운 것 찾기
 
-    var _loop = function _loop(i) {
+    var _loop = function _loop(_i) {
       // 이 라벨에 유효한 데이터가 있는 시리즈가 하나 이상 있는지 확인
       var hasValidData = sIds.some(function (sId) {
-        var _series$data, _series$data$i, _series$data2, _series$data2$i;
+        var _series$data, _series$data$_i, _series$data2, _series$data2$_i;
 
         var series = _this5.seriesList[sId];
-        return (series === null || series === void 0 ? void 0 : series.show) && ((_series$data = series.data) === null || _series$data === void 0 ? void 0 : (_series$data$i = _series$data[i]) === null || _series$data$i === void 0 ? void 0 : _series$data$i.o) !== null && ((_series$data2 = series.data) === null || _series$data2 === void 0 ? void 0 : (_series$data2$i = _series$data2[i]) === null || _series$data2$i === void 0 ? void 0 : _series$data2$i.o) !== undefined;
+        return (series === null || series === void 0 ? void 0 : series.show) && ((_series$data = series.data) === null || _series$data === void 0 ? void 0 : (_series$data$_i = _series$data[_i]) === null || _series$data$_i === void 0 ? void 0 : _series$data$_i.o) !== null && ((_series$data2 = series.data) === null || _series$data2 === void 0 ? void 0 : (_series$data2$_i = _series$data2[_i]) === null || _series$data2$_i === void 0 ? void 0 : _series$data2$_i.o) !== undefined;
       });
 
       if (hasValidData) {
-        var point = referenceData[i];
+        var point = referenceData[_i];
 
         if (point) {
           // 라벨 위치 계산
@@ -52086,15 +52054,15 @@ var plugins_interaction_modules = {
 
             if (distance < closestDistance) {
               closestDistance = distance;
-              closestIndex = i;
+              closestIndex = _i;
             }
           }
         }
       }
     };
 
-    for (var i = 0; i < referenceData.length; i++) {
-      _loop(i);
+    for (var _i = 0; _i < referenceData.length; _i++) {
+      _loop(_i);
     }
 
     return closestIndex;
@@ -52389,10 +52357,10 @@ var plugins_interaction_modules = {
    * @returns after {number[]}  '[0, 1 ...]' result Label index List
    */
   regulateSelectedLabelInfo: function regulateSelectedLabelInfo(labelIndex, targetAxis) {
-    var _this$options$selectL2, _this$options10, _this$defaultSelectIn;
+    var _this$options$selectL2, _this$options10, _this$defaultSelectIn5;
 
     var option = (_this$options$selectL2 = (_this$options10 = this.options) === null || _this$options10 === void 0 ? void 0 : _this$options10.selectLabel) !== null && _this$options$selectL2 !== void 0 ? _this$options$selectL2 : {};
-    var before = targetAxis === null || ((_this$defaultSelectIn = this.defaultSelectInfo) === null || _this$defaultSelectIn === void 0 ? void 0 : _this$defaultSelectIn.targetAxis) === targetAxis ? _objectSpread2(_objectSpread2({}, this.defaultSelectInfo), {}, {
+    var before = targetAxis === null || ((_this$defaultSelectIn5 = this.defaultSelectInfo) === null || _this$defaultSelectIn5 === void 0 ? void 0 : _this$defaultSelectIn5.targetAxis) === targetAxis ? _objectSpread2(_objectSpread2({}, this.defaultSelectInfo), {}, {
       targetAxis: targetAxis
     }) : {
       dataIndex: [],
@@ -52425,10 +52393,10 @@ var plugins_interaction_modules = {
    * @returns after {number[]}  '[0, 1 ...]' result series Id List
    */
   updateSelectedSeriesInfo: function updateSelectedSeriesInfo(seriesId, keepSelection) {
-    var _this$options$selectS, _this$options11, _this$defaultSelectIn2;
+    var _this$options$selectS, _this$options11, _this$defaultSelectIn6;
 
     var option = (_this$options$selectS = (_this$options11 = this.options) === null || _this$options11 === void 0 ? void 0 : _this$options11.selectSeries) !== null && _this$options$selectS !== void 0 ? _this$options$selectS : {};
-    var before = (_this$defaultSelectIn2 = this.defaultSelectInfo) !== null && _this$defaultSelectIn2 !== void 0 ? _this$defaultSelectIn2 : {
+    var before = (_this$defaultSelectIn6 = this.defaultSelectInfo) !== null && _this$defaultSelectIn6 !== void 0 ? _this$defaultSelectIn6 : {
       seriesId: []
     };