evui 3.3.49 → 3.3.50

package/dist/evui.common.js

@@ -7988,7 +7988,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.3.49\"}");
+module.exports = JSON.parse("{\"a\":\"3.3.50\"}");
 
 /***/ }),
 
@@ -30027,6 +30027,7 @@ var uses_contextMenuEvent = function contextMenuEvent(params) {
           menuItem.disabled = !menuItem.validate(menuItem.itemId, row);
         }
 
+        menuItem.selectedRow = row !== null && row !== void 0 ? row : [];
         return menuItem;
       });
       menuItems.push.apply(menuItems, _toConsumableArray(customItems));
@@ -33291,7 +33292,7 @@ var modules = {
         return null;
       }
 
-      itemPosition = [this.getItemByPosition([dataInfo.xp, dataInfo.yp], useApproximate, dataIndex)];
+      itemPosition = [this.getItemByPosition([dataInfo.xp, dataInfo.yp], useApproximate, dataIndex, true)];
     } else {
       var seriesList = Object.entries(this.seriesList);
       var firShowSeriesID;
@@ -33316,7 +33317,7 @@ var modules = {
           return null;
         }
 
-        return _this6.getItemByPosition([(_dataInfo$xp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.xp) !== null && _dataInfo$xp !== void 0 ? _dataInfo$xp : 0, (_dataInfo$yp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.yp) !== null && _dataInfo$yp !== void 0 ? _dataInfo$yp : 0], useApproximate, idx);
+        return _this6.getItemByPosition([(_dataInfo$xp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.xp) !== null && _dataInfo$xp !== void 0 ? _dataInfo$xp : 0, (_dataInfo$yp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.yp) !== null && _dataInfo$yp !== void 0 ? _dataInfo$yp : 0], useApproximate, idx, true);
       });
     }
 
@@ -33344,6 +33345,8 @@ var modules = {
    * @param {array}   offset          position x and y
    * @param {boolean} useApproximate  if it's true. it'll look for closed item on mouse position
    * @param {number} dataIndex        selected data index
+   * @param {boolean}  useSelectLabelOrItem   used to display select label/item at tooltip location
+   *
    * @returns {object} clicked item information
    */
   getItemByPosition: function getItemByPosition(offset) {
@@ -33351,6 +33354,7 @@ var modules = {
 
     var useApproximate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var dataIndex = arguments.length > 2 ? arguments[2] : undefined;
+    var useSelectLabelOrItem = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     var seriesIDs = Object.keys(this.seriesList);
     var isHorizontal = !!this.options.horizontal;
     var maxType = null;
@@ -33368,7 +33372,7 @@ var modules = {
       var findFn = useApproximate ? series.findApproximateData : series.findGraphData;
 
       if (findFn) {
-        var item = findFn.call(series, offset, isHorizontal, dataIndex);
+        var item = findFn.call(series, offset, isHorizontal, dataIndex, useSelectLabelOrItem);
         var data = item.data;
         var index = item.index;
 
@@ -33659,7 +33663,7 @@ var modules = {
         offsetX = x;
       }
 
-      hitInfo = this.getItemByPosition([offsetX, y], selectLabel === null || selectLabel === void 0 ? void 0 : selectLabel.useApproximateValue, dataIndex);
+      hitInfo = this.getItemByPosition([offsetX, y], selectLabel === null || selectLabel === void 0 ? void 0 : selectLabel.useApproximateValue, dataIndex, true);
       labelIndex = (_hitInfo$maxIndex = hitInfo.maxIndex) !== null && _hitInfo$maxIndex !== void 0 ? _hitInfo$maxIndex : -1;
     }
 
@@ -35153,6 +35157,9 @@ var element_line_Line = /*#__PURE__*/function () {
       }
     };
     this.data = [];
+    this.beforeMouseXp = 0;
+    this.beforeMouseYp = 0;
+    this.beforeFindItemIndex = -1;
     this.size = {
       comboOffset: 0
     };
@@ -35374,14 +35381,17 @@ var element_line_Line = /*#__PURE__*/function () {
     }
     /**
      * Find graph item
-     * @param {array}  offset       mouse position
+     * @param {array}    offset          mouse position
+     * @param {boolean}  isHorizontal
+     * @param {number}   dataIndex       selected label data index
+     * @param {boolean}  useSelectLabelOrItem   used to display select label/item at tooltip location
      *
      * @returns {object} graph item
      */
 
   }, {
     key: "findGraphData",
-    value: function findGraphData(offset, isHorizontal, dataIndex) {
+    value: function findGraphData(offset, isHorizontal, dataIndex, useSelectLabelOrItem) {
       var xp = offset[0];
       var yp = offset[1];
       var item = {
@@ -35390,11 +35400,15 @@ var element_line_Line = /*#__PURE__*/function () {
         color: this.color
       };
       var gdata = this.data;
+      var SPARE_XP = 0.5;
 
       if (gdata !== null && gdata !== void 0 && gdata.length) {
         if (typeof dataIndex === 'number' && this.show) {
           item.data = gdata[dataIndex];
           item.index = dataIndex;
+        } else if (typeof this.beforeFindItemIndex === 'number' && this.show && useSelectLabelOrItem) {
+          item.data = gdata[this.beforeFindItemIndex];
+          item.index = this.beforeFindItemIndex;
         } else {
           var _gdata$;
 
@@ -35408,14 +35422,50 @@ var element_line_Line = /*#__PURE__*/function () {
             var y = gdata[m].yp;
 
             if (x - xpInterval < xp && xp < x + xpInterval) {
-              item.data = gdata[m];
-              item.index = m;
+              var _gdata$m, _gdata$xp, _gdata, _gdata2, _gdata3;
+
+              var curXpInterval = ((_gdata$m = gdata[m]) === null || _gdata$m === void 0 ? void 0 : _gdata$m.xp) - ((_gdata$xp = (_gdata = gdata[m - 1]) === null || _gdata === void 0 ? void 0 : _gdata.xp) !== null && _gdata$xp !== void 0 ? _gdata$xp : 0);
+
+              if ((_gdata2 = gdata[m - 1]) !== null && _gdata2 !== void 0 && _gdata2.xp && (_gdata3 = gdata[m + 1]) !== null && _gdata3 !== void 0 && _gdata3.xp && curXpInterval > 0) {
+                var leftXp = xp - gdata[m - 1].xp;
+                var midXp = Math.abs(xp - gdata[m].xp);
+                var rightXp = gdata[m + 1].xp - xp;
+
+                if (Math.abs(this.beforeMouseXp - xp) >= curXpInterval - SPARE_XP && (this.beforeFindItemIndex === m || midXp === rightXp || midXp === leftXp)) {
+                  if (this.beforeMouseXp - xp > 0) {
+                    item.data = gdata[this.beforeFindItemIndex - 1];
+                    item.index = this.beforeFindItemIndex - 1;
+                  } else if (this.beforeMouseXp - xp < 0) {
+                    item.data = gdata[this.beforeFindItemIndex + 1];
+                    item.index = this.beforeFindItemIndex + 1;
+                  } else if (this.beforeMouseYp !== yp) {
+                    item.data = gdata[this.beforeFindItemIndex];
+                    item.index = this.beforeFindItemIndex;
+                  }
+                } else {
+                  var closeXp = Math.min(leftXp, midXp, rightXp);
+
+                  if (closeXp === leftXp) {
+                    item.data = gdata[m - 1];
+                    item.index = m - 1;
+                  } else if (closeXp === rightXp) {
+                    item.data = gdata[m + 1];
+                    item.index = m + 1;
+                  } else {
+                    item.data = gdata[m];
+                    item.index = m;
+                  }
+                }
+              } else {
+                item.data = gdata[m];
+                item.index = m;
+              }
 
               if (y - 6 <= yp && yp <= y + 6) {
                 item.hit = true;
               }
 
-              return item;
+              break;
             } else if (x + xpInterval > xp) {
               e = m - 1;
             } else {
@@ -35425,6 +35475,15 @@ var element_line_Line = /*#__PURE__*/function () {
         }
       }
 
+      if (!useSelectLabelOrItem) {
+        this.beforeMouseXp = xp;
+        this.beforeMouseYp = yp;
+
+        if (typeof item.index === 'number') {
+          this.beforeFindItemIndex = item.index;
+        }
+      }
+
       return item;
     }
     /**
@@ -49394,6 +49453,7 @@ var treeGrid_uses_contextMenuEvent = function contextMenuEvent(params) {
           menuItem.disabled = !menuItem.validate(menuItem.itemId, row);
         }
 
+        menuItem.selectedRow = row !== null && row !== void 0 ? row : [];
         return menuItem;
       });
       menuItems.push.apply(menuItems, _toConsumableArray(customItems));