refactor(geo): change option name to echartsStyle and enable more s…

…tyle options
apache · Dec 5, 2024 · 8f39773 · 8f39773
1 parent cdb0ebc
commit 8f39773
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 42 deletions.
diff --git a/src/component/helper/MapDraw.ts b/src/component/helper/MapDraw.ts
@@ -302,13 +302,9 @@ class MapDraw {
                     ? mapOrGeoModel.getRegionModel(regionName)
                     : (data ? data.getItemModel(dataIdx) as Model<MapDataItemOption> : null);
 
-                // allow specified itemStyle in GeoJSON data
-                const regionItemStyle = region.properties && region.properties.itemStyle;
-                if (regionItemStyle) {
-                    const regionModelOption = regionModel.option;
-                    const modelItemStyle = regionModelOption.itemStyle || (regionModelOption.itemStyle = {});
-                    modelItemStyle && zrUtil.defaults(modelItemStyle, regionItemStyle);
-                }
+                // allow specified echarts style in GeoJSON data
+                const specifiedRegionStyle = region.properties && region.properties.echartsStyle;
+                specifiedRegionStyle && zrUtil.merge(regionModel.option, specifiedRegionStyle);
 
                 regionsInfoByName.set(regionName, { dataIdx, regionModel });
             }

diff --git a/src/coord/geo/Region.ts b/src/coord/geo/Region.ts
@@ -25,7 +25,7 @@ import { GeoJSON, GeoProjection, GeoSVGGraphicRoot } from './geoTypes';
 import * as matrix from 'zrender/src/core/matrix';
 import type Element from 'zrender/src/Element';
 import { each } from 'zrender/src/core/util';
-import type { GeoItemStyleOption } from './GeoModel';
+import type { RegoinOption } from './GeoModel';
 
 const TMP_TRANSFORM = [] as number[];
 
@@ -137,7 +137,7 @@ export class GeoJSONRegion extends Region {
 
     // Injected outside.
     properties: GeoJSON['features'][0]['properties'] & {
-        itemStyle?: GeoItemStyleOption
+        echartsStyle?: Omit<RegoinOption, 'name' | 'selected'>
     };
 
     constructor(

diff --git a/test/geo-map.html b/test/geo-map.html