evui 3.4.125 → 3.4.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.4.125",
+  "version": "3.4.127",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/chart/chart.core.js

@@ -272,21 +272,24 @@ class EvChart {
       isReverseOrder ? jx-- : jx++
     ) {
       const series = this.seriesList[chartTypeSet[jx]];
-      if (this.options.realTimeScatter?.use) {
-        const seriesDatas = series.data[series.sId]?.dataGroup;
-        for (let i = 0; i < seriesDatas.length; i++) {
-          const dataItems = seriesDatas[i]?.data || [];
-          for (let j = 0; j < dataItems.length; j++) {
-            const item = dataItems[j];
+      const shouldInclude = !!series?.show;
+      if (shouldInclude) {
+        if (this.options.realTimeScatter?.use) {
+          const seriesDatas = series.data[series.sId]?.dataGroup;
+          for (let i = 0; i < seriesDatas.length; i++) {
+            const dataItems = seriesDatas[i]?.data || [];
+            for (let j = 0; j < dataItems.length; j++) {
+              const item = dataItems[j];
+              duple.set(`${item.x}${item.y}`, series.sId);
+            }
+          }
+        } else {
+          const seriesDatas = this.data.data[chartTypeSet[jx]] ?? [];
+          for (let i = 0; i < seriesDatas.length; i++) {
+            const item = seriesDatas[i];
             duple.set(`${item.x}${item.y}`, series.sId);
           }
         }
-      } else {
-        const seriesDatas = this.data.data[chartTypeSet[jx]] ?? [];
-        for (let i = 0; i < seriesDatas.length; i++) {
-          const item = seriesDatas[i];
-          duple.set(`${item.x}${item.y}`, series.sId);
-        }
       }
     }
   }

package/src/components/chart/plugins/plugins.interaction.js

@@ -37,7 +37,22 @@ const modules = {
         if (tooltip.use && this.isInitTooltip) {
           this.drawItemsHighlight(hitInfo, ctx);
 
-          if (tooltip?.formatter?.html) {
+          if (typeof tooltip?.returnValue === 'function') {
+            const seriesList = [];
+            Object.keys(hitInfo.items).forEach((sId) => {
+              seriesList.push({
+                sId,
+                data: hitInfo.items[sId].data,
+                color: hitInfo.items[sId].color,
+                name: hitInfo.items[sId].name,
+                dataId: hitInfo.items[sId].id,
+                index: hitInfo.items[sId].index,
+              });
+            });
+
+            this.hideTooltipDOM();
+            tooltip.returnValue(seriesList, e);
+          } else if (tooltip?.formatter?.html) {
             this.drawCustomTooltip(hitInfo?.items);
             this.setCustomTooltipLayoutPosition(hitInfo, e);
           } else {
@@ -52,6 +67,10 @@ const modules = {
           }
         }
       } else if (tooltip.use && this.isInitTooltip) {
+        if (typeof tooltip?.returnValue === 'function') {
+          tooltip.returnValue([], e);
+        }
+
         this.hideTooltipDOM();
       }
 
@@ -88,7 +107,7 @@ const modules = {
      * @returns {undefined}
      */
 
-    this.onMouseLeave = () => {
+    this.onMouseLeave = (e) => {
       const { tooltip, dragSelection } = this.options;
 
       if (tooltip.throttledMove) {
@@ -100,6 +119,10 @@ const modules = {
       }
 
       if (tooltip.use && this.isInitTooltip) {
+        if (typeof tooltip?.returnValue === 'function') {
+          tooltip.returnValue([], e);
+        }
+
         this.tooltipClear();
       }
       this.listeners['mouse-leave']();