Merge pull request #14243 from apache/feat-visualMap-itemSymbol

fix(visualMap): use itemSymbol as default symbol type and fix #5719
apache · Apr 7, 2021 · 98ee07d · 98ee07d
2 parents 304685d + a95ff6a
commit 98ee07d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/src/component/visualMap/PiecewiseModel.ts b/src/component/visualMap/PiecewiseModel.ts
@@ -244,6 +244,13 @@ class PiecewiseModel extends VisualMapModel<PiecewiseVisualMapOption> {
         // thisOption.selectedMode === 'multiple', default: all selected.
     }
 
+    /**
+     * @public
+     */
+    getItemSymbol(): string {
+        return this.get('itemSymbol');
+    }
+
     /**
      * @public
      */

diff --git a/src/component/visualMap/VisualMapModel.ts b/src/component/visualMap/VisualMapModel.ts
@@ -236,6 +236,13 @@ class VisualMapModel<Opts extends VisualMapOption = VisualMapOption> extends Com
         );
     }
 
+    /**
+     * @public
+     */
+    getItemSymbol(): string {
+        return null;
+    }
+
     /**
      * @protected
      * @return {Array.<number>} An array of series indices.
@@ -483,6 +490,8 @@ class VisualMapModel<Opts extends VisualMapOption = VisualMapOption> extends Com
             const symbolSizeExists = (controller.inRange || {}).symbolSize
                 || (controller.outOfRange || {}).symbolSize;
             const inactiveColor = this.get('inactiveColor');
+            const itemSymbol = this.getItemSymbol();
+            const defaultSymbol = itemSymbol || 'roundRect';
 
             each(this.stateList, function (state: VisualState) {
 
@@ -501,17 +510,17 @@ class VisualMapModel<Opts extends VisualMapOption = VisualMapOption> extends Com
                 if (visuals.symbol == null) {
                     visuals.symbol = symbolExists
                         && zrUtil.clone(symbolExists)
-                        || (isCategory ? 'roundRect' : ['roundRect']);
+                        || (isCategory ? defaultSymbol : [defaultSymbol]);
                 }
                 if (visuals.symbolSize == null) {
                     visuals.symbolSize = symbolSizeExists
                         && zrUtil.clone(symbolSizeExists)
                         || (isCategory ? itemSize[0] : [itemSize[0], itemSize[0]]);
                 }
 
-                // Filter square and none.
+                // Filter none
                 visuals.symbol = mapVisual(visuals.symbol, function (symbol) {
-                    return (symbol === 'none' || symbol === 'square') ? 'roundRect' : symbol;
+                    return symbol === 'none' ? defaultSymbol : symbol;
                 });
 
                 // Normalize symbolSize

diff --git a/src/component/visualMap/VisualMapView.ts b/src/component/visualMap/VisualMapView.ts
@@ -27,7 +27,6 @@ import GlobalModel from '../../model/Global';
 import ExtensionAPI from '../../core/ExtensionAPI';
 import VisualMapModel from './VisualMapModel';
 import { VisualOptionUnit, ColorString } from '../../util/types';
-import PiecewiseModel from './PiecewiseModel';
 
 type VisualState = VisualMapModel['stateList'][number];
 
@@ -117,9 +116,6 @@ class VisualMapView extends ComponentView {
         const visualObj: {[key in typeof visualCluster]?: VisualOptionUnit[key]} = {};
 
         // Default values.
-        if (visualCluster === 'symbol') {
-            visualObj.symbol = (visualMapModel as PiecewiseModel).get('itemSymbol');
-        }
         if (visualCluster === 'color') {
             const defaultColor = visualMapModel.get('contentColor');
             visualObj.color = defaultColor as ColorString;

diff --git a/test/visualMap-scatter-colorAndSymbol.html b/test/visualMap-scatter-colorAndSymbol.html