evui 3.3.44 → 3.3.45

package/dist/evui.common.js

@@ -7972,7 +7972,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.3.44\"}");
+module.exports = JSON.parse("{\"a\":\"3.3.45\"}");
 
 /***/ }),
 
@@ -33301,13 +33301,15 @@ var modules = {
       }
 
       itemPosition = dataIndex.map(function (idx) {
+        var _dataInfo$xp, _dataInfo$yp;
+
         var dataInfo = _this6.getDataByValues(firShowSeriesID, idx);
 
-        if (!dataInfo || !(dataInfo !== null && dataInfo !== void 0 && dataInfo.xp) || !(dataInfo !== null && dataInfo !== void 0 && dataInfo.yp)) {
+        if (!dataInfo) {
           return null;
         }
 
-        return _this6.getItemByPosition([dataInfo.xp, dataInfo.yp], useApproximate);
+        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);
       });
     }
 
@@ -43362,9 +43364,13 @@ var element_tip_modules = {
     var maxArgs;
     var isExistSelectedLabel;
 
-    var executeDrawTip = function executeDrawTip(tipOpt) {
+    if (labelTipOpt.use && labelTipOpt.showTip) {
+      isExistSelectedLabel = this.drawLabelTip();
+    }
+
+    var executeDrawIndicator = function executeDrawIndicator(tipOpt) {
       tipLocationInfo.forEach(function (tipInfo) {
-        if (tipInfo && !isExistSelectedLabel) {
+        if (tipInfo) {
           var seriesInfo = _this.seriesList[tipInfo === null || tipInfo === void 0 ? void 0 : tipInfo.sId];
 
           if (!(seriesInfo !== null && seriesInfo !== void 0 && seriesInfo.show)) {
@@ -43414,11 +43420,11 @@ var element_tip_modules = {
       });
     };
 
-    if (tipLocationInfo) {
+    if (tipLocationInfo && !isExistSelectedLabel) {
       if (selTipOpt.use) {
-        executeDrawTip(selTipOpt);
-      } else if (labelTipOpt.use) {
-        executeDrawTip(labelTipOpt);
+        executeDrawIndicator(selTipOpt);
+      } else if (labelTipOpt.use && opt.type === 'line') {
+        executeDrawIndicator(labelTipOpt);
       }
     }