fix(marker): marker state not restore after blur

src/component/marker/MarkerView.ts

@@ -25,7 +25,7 @@ import ExtensionAPI from '../../core/ExtensionAPI';
 import { makeInner } from '../../util/model';
 import SeriesModel from '../../model/Series';
 import Group from 'zrender/src/graphic/Group';
-import { enterBlur } from '../../util/states';
+import { enterBlur, leaveBlur } from '../../util/states';
 
 const inner = makeInner<{
     keep: boolean
@@ -71,7 +71,7 @@ abstract class MarkerView extends ComponentView {
         inner(drawGroup).keep = true;
     }
 
-    blurSeries(seriesModelList: SeriesModel[]) {
+    toggleBlurSeries(seriesModelList: SeriesModel[], isBlur: boolean) {
         each(seriesModelList, seriesModel => {
             const markerModel = MarkerModel.getMarkerModelFromSeries(
                 seriesModel,
@@ -81,7 +81,7 @@ abstract class MarkerView extends ComponentView {
                 const data = markerModel.getData();
                 data.eachItemGraphicEl(function (el) {
                     if (el) {
-                        enterBlur(el);
+                        isBlur ? enterBlur(el) : leaveBlur(el);
                     }
                 });
             }

src/util/states.ts

@@ -61,6 +61,7 @@ import GlobalModel from '../model/Global';
 import ExtensionAPI from '../core/ExtensionAPI';
 import ComponentModel from '../model/Component';
 import { error } from './log';
+import type ComponentView from '../view/Component';
 
 // Reserve 0 as default.
 let _highlightNextDigit = 1;
@@ -427,19 +428,32 @@ function shouldSilent(el: Element, e: ElementEvent) {
 
 export function allLeaveBlur(api: ExtensionAPI) {
     const model = api.getModel();
+    const leaveBlurredSeries: SeriesModel[] = [];
+    const allComponents: ComponentModel[] = [];
     model.eachComponent(function (componentType, componentModel) {
         const componentStates = getComponentStates(componentModel);
+        const isSeries = componentType === 'series';
+        const view = isSeries ? api.getViewOfSeriesModel(componentModel as SeriesModel)
+            : api.getViewOfComponentModel(componentModel);
+        !isSeries && allComponents.push(componentModel);
+        isSeries && leaveBlurredSeries.push(componentModel as SeriesModel);
         if (componentStates.isBlured) {
-            const view = componentType === 'series'
-                ? api.getViewOfSeriesModel(componentModel as SeriesModel)
-                : api.getViewOfComponentModel(componentModel);
             // Leave blur anyway
             view.group.traverse(function (child) {
                 singleLeaveBlur(child);
             });
         }
+        if (view && (view as ComponentView).toggleBlurSeries) {
+            (view as ComponentView).toggleBlurSeries(leaveBlurredSeries, false, model);
+        }
         componentStates.isBlured = false;
     });
+    each(allComponents, function (component) {
+        const view = api.getViewOfComponentModel(component);
+        if (view && (view as ComponentView).toggleBlurSeries) {
+            (view as ComponentView).toggleBlurSeries(leaveBlurredSeries, false, model);
+        }
+    });
 }
 
 export function blurSeries(
@@ -519,8 +533,8 @@ export function blurSeries(
             return;
         }
         const view = api.getViewOfComponentModel(componentModel);
-        if (view && view.blurSeries) {
-            view.blurSeries(blurredSeries, ecModel);
+        if (view && view.toggleBlurSeries) {
+            view.toggleBlurSeries(blurredSeries, true, ecModel);
         }
     });
 }

src/view/Component.ts

@@ -107,11 +107,11 @@ class ComponentView {
     }
 
     /**
-     * Hook for blur target series.
-     * Can be used in marker for blur the markers
+     * Hook for toggle blur target series.
+     * Can be used in marker for blur or leave blur the markers
      */
-    blurSeries(seriesModels: SeriesModel[], ecModel: GlobalModel): void {
-         // Do nothing;
+    toggleBlurSeries(seriesModels: SeriesModel[], isBlur: boolean, ecModel: GlobalModel): void {
+        // Do nothing;
     }
 
     /**