tvcharts 0.7.52 → 0.7.54

package/dist/echarts.js

@@ -2197,7 +2197,7 @@ var Handler = class extends Eventful_default {
     }
   }
   findHover(x, y, exclude) {
-    const list = this.storage.getDisplayList();
+    const list = this.storage.getEventDisplayList();
     const out2 = new HoveredResult(x, y);
     setHoverTarget(list, out2, x, y, exclude);
     if (this._pointerSize && !out2.target) {
@@ -2854,10 +2854,29 @@ function shapeCompareFunc(a, b) {
   }
   return a.zlevel - b.zlevel;
 }
+function eventCompareFunc(a, b) {
+  return a.zevent - b.zevent;
+}
+function getEventDisplayList(list) {
+  const zEventList = [];
+  const restList = [];
+  for (let i = 0; i < list.length; i++) {
+    const el = list[i];
+    if (el.zevent) {
+      zEventList.push(el);
+    } else {
+      restList.push(el);
+    }
+  }
+  sort(zEventList, eventCompareFunc);
+  Array.prototype.push.apply(restList, zEventList);
+  return restList;
+}
 var Storage = class {
   constructor() {
     this._roots = [];
     this._displayList = [];
+    this._eventDisplayList = [];
     this._displayListLen = 0;
     this.displayableSortFunc = shapeCompareFunc;
   }
@@ -2883,6 +2902,10 @@ var Storage = class {
     }
     displayList.length = this._displayListLen;
     sort(displayList, shapeCompareFunc);
+    this._eventDisplayList = getEventDisplayList(displayList);
+  }
+  getEventDisplayList() {
+    return this._eventDisplayList;
   }
   _updateAndAddDisplayable(el, clipPaths, includeIgnore) {
     if (el.ignore && !includeIgnore) {
@@ -7215,7 +7238,7 @@ function getElementSSRData(el) {
 function registerSSRDataGetter(getter) {
   ssrDataGetter = getter;
 }
-var version = "5.6.74";
+var version = "5.6.75";
 
 // src/util/number.ts
 var RADIAN_EPSILON = 1e-4;
@@ -11912,6 +11935,10 @@ function handleGlobalMouseOverForHighDown(dispatcher, e2, api2) {
   const ecData = getECData(dispatcher);
   const groupId = ecData.groupId;
   if (groupId) {
+    const highlightDisabled = api2.getHighlightDisabled();
+    if (highlightDisabled) {
+      return;
+    }
     const dispatchers2 = findGroupHighDownDispatchers(groupId, api2);
     each(dispatchers2, (dispatcher2) => enterEmphasisWhenMouseOver(dispatcher2, e2));
     api2.setMousemoveComponentGroupId(groupId);
@@ -11951,6 +11978,27 @@ function handleGlobalMouseOutForHighDown(dispatcher, e2, api2) {
     leaveEmphasisWhenMouseOut(dispatcher, e2);
   }
 }
+function handleGlobalMouseDownForHighDown(dispatcher, e2, api2) {
+  const oldSelectedComponentGroupId = api2.getSelectedComponentGroupId();
+  const groupId = dispatcher ? getECData(dispatcher).groupId : "";
+  if (groupId) {
+    if (oldSelectedComponentGroupId === groupId) {
+      return false;
+    }
+    const highlightDisabled = api2.getHighlightDisabled();
+    if (highlightDisabled) {
+      return;
+    }
+    e2.event.stopPropagation();
+    api2.setSelectedComponentGroupId(groupId);
+    return true;
+  } else if (oldSelectedComponentGroupId) {
+    e2.event.stopPropagation();
+    api2.setSelectedComponentGroupId("");
+    return true;
+  }
+  return false;
+}
 function toggleSelectionFromPayload(seriesModel, payload, api2) {
   if (!isSelectChangePayload(payload)) {
     return;
@@ -23923,6 +23971,7 @@ var CONNECT_LAYOUT_STATUS_KEY = "__connectLayoutUpdateStatus";
 var CONNECT_STATUS_PENDING = 0;
 var CONNECT_STATUS_UPDATING = 1;
 var CONNECT_STATUS_UPDATED = 2;
+var SELECT_Z_LEVEL = 1;
 function createRegisterEventWithLowercaseECharts(method) {
   return function(...args) {
     if (this.isDisposed()) {
@@ -24623,7 +24672,8 @@ var ECharts = class extends Eventful_default {
       "visiblechanged",
       "dataappend",
       "alarmchanged",
-      "alarmdelete"
+      "alarmdelete",
+      "selectidchanged"
     ], (eventType) => {
       this._messageCenter.on(eventType, function(event) {
         this.trigger(eventType, event);
@@ -24729,6 +24779,9 @@ var ECharts = class extends Eventful_default {
     this._loadingFX = el;
     zr.add(el);
   }
+  getApi() {
+    return this._api;
+  }
   hideLoading() {
     if (this._disposed) {
       disposedWarning(this.id);
@@ -25468,6 +25521,10 @@ ECharts.internalField = function() {
         handleGlobalMouseOutForHighDown(dispatcher, e2, ecIns._api);
         markStatusToUpdate(ecIns);
       }
+    }).on("mousedown", function(e2) {
+      const el = e2.target;
+      const dispatcher = findEventDispatcher(el, isHighDownDispatcher);
+      handleGlobalMouseDownForHighDown(dispatcher, e2, ecIns._api);
     }).on("click", function(e2) {
       const el = e2.target;
       const dispatcher = findEventDispatcher(el, (target) => getECData(target).dataIndex != null, true);
@@ -25556,11 +25613,12 @@ ECharts.internalField = function() {
     });
   };
   renderComponents = (ecIns, ecModel, api2, payload, updateParams, dirtyList) => {
+    const selectedComponentGroupId = ecIns.selectedComponentGroupId;
     each(dirtyList || ecIns._componentsViews, function(componentView) {
       const componentModel = componentView.__model;
       clearStates(componentModel, componentView);
       componentView.render(componentModel, ecModel, api2, payload, ecIns);
-      updateZ3(componentModel, componentView);
+      updateZ3(componentModel, componentView, selectedComponentGroupId);
       updateStates(componentModel, componentView);
     });
   };
@@ -25594,9 +25652,10 @@ ECharts.internalField = function() {
     scheduler.unfinished = unfinished || scheduler.unfinished;
     lifecycle_default.trigger("series:layoutlabels", ecModel, api2, updateParams);
     lifecycle_default.trigger("series:transition", ecModel, api2, updateParams);
+    const selectedComponentGroupId = ecIns.selectedComponentGroupId;
     ecModel.eachSeries(function(seriesModel) {
       const chartView = ecIns._chartsMap[seriesModel.__viewId];
-      updateZ3(seriesModel, chartView);
+      updateZ3(seriesModel, chartView, selectedComponentGroupId);
       updateStates(seriesModel, chartView);
     });
     if (ecIns.mousemoveComponentGroupId && payload?.type !== "dataZoom") {
@@ -25681,12 +25740,14 @@ ECharts.internalField = function() {
     });
   }
   ;
-  function updateZ3(model, view) {
+  function updateZ3(model, view, selectedComponentGroupId) {
     if (model.preventAutoZ) {
       return;
     }
+    const groupId = model.get("groupId");
+    const isSelected = selectedComponentGroupId && selectedComponentGroupId === groupId;
     const z = model.get("z") || 0;
-    const zlevel = model.get("zlevel") || 0;
+    const zlevel = isSelected ? SELECT_Z_LEVEL : model.get("zlevel") || 0;
     const z2 = model.get("z2") || 0;
     view.eachRendered((el) => {
       doUpdateZ(el, z, zlevel, -Infinity, z2);
@@ -25840,7 +25901,23 @@ ECharts.internalField = function() {
         ecIns.mousemoveComponentGroupId = id;
       }
       setSelectedComponentGroupId(id) {
+        const oldSelectedComponentGroupId = ecIns.selectedComponentGroupId;
+        if (oldSelectedComponentGroupId === id) {
+          return;
+        }
         ecIns.selectedComponentGroupId = id;
+        ecIns.trigger("selectidchanged", id);
+        updateMethods.update.call(ecIns);
+        console.log("\u56FE\u5F62\u66F4\u65B0");
+      }
+      getSelectedComponentGroupId() {
+        return ecIns.selectedComponentGroupId;
+      }
+      setHighlightDisabled(disabled) {
+        ecIns.highlightDisabled = disabled;
+      }
+      getHighlightDisabled() {
+        return ecIns.highlightDisabled;
       }
     }(ecIns);
   };
@@ -34308,7 +34385,10 @@ LineSeriesModel.defaultOption = {
     type: "solid"
   },
   emphasis: {
-    scale: true
+    scale: true,
+    emphasisState: {
+      zlevel: 1
+    }
   },
   step: false,
   smooth: false,
@@ -35814,18 +35894,23 @@ var LineView = class extends Chart_default {
     const focus = emphasisModel.get("focus");
     const blurScope = emphasisModel.get("blurScope");
     const emphasisDisabled = emphasisModel.get("disabled");
+    const groupId = seriesModel.get("groupId");
     polyline.useStyle(defaults(lineStyleModel.getLineStyle(), {
       fill: "none",
       stroke: visualColor,
       lineJoin: "bevel"
     }));
-    setStatesStylesFromModel(polyline, seriesModel, "lineStyle");
-    if (polyline.style.lineWidth > 0 && seriesModel.get(["emphasis", "lineStyle", "width"]) === "bolder") {
-      const emphasisLineStyle = polyline.getState("emphasis").style;
-      emphasisLineStyle.lineWidth = +polyline.style.lineWidth + 1;
+    if (groupId) {
+      polyline.states.emphasis = emphasisModel.get("emphasisState");
+    } else {
+      setStatesStylesFromModel(polyline, seriesModel, "lineStyle");
+      if (polyline.style.lineWidth > 0 && seriesModel.get(["emphasis", "lineStyle", "width"]) === "bolder") {
+        const emphasisLineStyle = polyline.getState("emphasis").style;
+        emphasisLineStyle.lineWidth = +polyline.style.lineWidth + 1;
+      }
+      getECData(polyline).seriesIndex = seriesModel.seriesIndex;
+      toggleHoverEmphasis(polyline, focus, blurScope, emphasisDisabled);
     }
-    getECData(polyline).seriesIndex = seriesModel.seriesIndex;
-    toggleHoverEmphasis(polyline, focus, blurScope, emphasisDisabled);
     const smooth = getSmooth(seriesModel.get("smooth"));
     const smoothMonotone = seriesModel.get("smoothMonotone");
     polyline.setShape({
@@ -35851,9 +35936,13 @@ var LineView = class extends Chart_default {
         smoothMonotone,
         connectNulls
       });
-      setStatesStylesFromModel(polygon, seriesModel, "areaStyle");
-      getECData(polygon).seriesIndex = seriesModel.seriesIndex;
-      toggleHoverEmphasis(polygon, focus, blurScope, emphasisDisabled);
+      if (groupId) {
+        polygon.states.emphasis = emphasisModel.get("emphasisState");
+      } else {
+        setStatesStylesFromModel(polygon, seriesModel, "areaStyle");
+        getECData(polygon).seriesIndex = seriesModel.seriesIndex;
+        toggleHoverEmphasis(polygon, focus, blurScope, emphasisDisabled);
+      }
     }
     const changePolyState = (toState) => {
       this._changePolyState(toState);
@@ -35861,7 +35950,12 @@ var LineView = class extends Chart_default {
     data.eachItemGraphicEl(function(el) {
       el && (el.onHoverStateChange = changePolyState);
     });
-    this._polyline.onHoverStateChange = changePolyState;
+    if (!groupId) {
+      this._polyline.onHoverStateChange = changePolyState;
+    } else {
+      getECData(group).groupId = groupId;
+      toggleHoverEmphasis(group, null, null, emphasisDisabled);
+    }
     this._data = data;
     this._coordSys = coordSys;
     this._stackedOnPoints = stackedOnPoints;
@@ -57493,9 +57587,6 @@ var LineFillsView2 = class extends Chart_default {
     } else {
       this.group.removeClipPath();
     }
-    toggleHoverEmphasis(this.group, null, null, false);
-    const groupId = seriesModel.get("groupId");
-    getECData(this.group).groupId = groupId;
   }
   _getClipShape(seriesModel) {
     if (!seriesModel.get("clip", true)) {
@@ -57505,7 +57596,6 @@ var LineFillsView2 = class extends Chart_default {
     return coordSys && coordSys.getArea && coordSys.getArea(0.1);
   }
   _renderLines(data, seriesModel, api2) {
-    const emphasisState = seriesModel.get("emphasis").emphasisState;
     if (!this._linesGroup) {
       this._linesGroup = new Group_default();
       this.group.add(this._linesGroup);
@@ -57527,7 +57617,6 @@ var LineFillsView2 = class extends Chart_default {
         },
         z2
       });
-      el.states.emphasis = emphasisState;
       linesGroup.add(el);
     });
   }
@@ -59321,7 +59410,8 @@ var LabelsView2 = class extends Chart_default {
         },
         style: {
           fill: "#000000",
-          lineWidth: isLine ? 3 : void 0
+          stroke: isLine ? "#000000" : "none",
+          lineWidth: isLine ? 2 : void 0
         }
       });
       el.symbolProxy = createSymbol(key, 0, 0, 0, 0);
@@ -60018,8 +60108,6 @@ var FillsView2 = class extends Chart_default {
     const z2 = seriesModel.get("z2");
     const polygonGroup = this._polygonGroup;
     const coordSys = seriesModel.coordinateSystem;
-    const emphasisState = seriesModel.get("emphasis").emphasisState;
-    const groupId = seriesModel.get("groupId");
     each(pointsByColor, function(points4, key) {
       const colors = key.split(":");
       let fill = key;
@@ -60053,7 +60141,6 @@ var FillsView2 = class extends Chart_default {
         },
         z2: isDefaultFill ? -1 : z2
       });
-      el.states.emphasis = emphasisState;
       polygonGroup.add(el);
     });
     const clipPath = seriesModel.get("clip", true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
@@ -60062,8 +60149,6 @@ var FillsView2 = class extends Chart_default {
     } else {
       this.group.removeClipPath();
     }
-    toggleHoverEmphasis(this.group, null, null, false);
-    getECData(this.group).groupId = groupId;
   }
   eachRendered(cb) {
     traverseElements(this._polygonGroup, cb);
@@ -60316,8 +60401,6 @@ var BgColorView2 = class extends Chart_default {
     } else {
       this._bgColorGroup.removeAll();
     }
-    const emphasisState = seriesModel.get("emphasis").emphasisState;
-    const groupId = seriesModel.get("groupId");
     const bgColorGroup = this._bgColorGroup;
     const barWidth = Math.ceil(seriesModel.coordinateSystem.getBaseAxis().scale.barSpace) || 5;
     const isLine = barWidth <= 4;
@@ -60334,7 +60417,6 @@ var BgColorView2 = class extends Chart_default {
           lineWidth: isLine ? +barWidth : void 0
         }
       });
-      el.states.emphasis = emphasisState;
       bgColorGroup.add(el);
     });
     const clipPath = seriesModel.get("clip", true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
@@ -60343,8 +60425,6 @@ var BgColorView2 = class extends Chart_default {
     } else {
       this.group.removeClipPath();
     }
-    toggleHoverEmphasis(this.group, null, null, false);
-    getECData(this.group).groupId = groupId;
   }
   eachRendered(cb) {
     traverseElements(this._bgColorGroup, cb);
@@ -67705,7 +67785,8 @@ function updateCommonAttrs(el, elOption, defaultZ, defaultZlevel) {
       ["cursor", Displayable_default.prototype.cursor],
       ["zlevel", defaultZlevel || 0],
       ["z", defaultZ || 0],
-      ["z2", 0]
+      ["z2", 0],
+      ["zevent", 1]
     ], (item) => {
       const prop = item[0];
       if (hasOwn(elOption, prop)) {