Skip to content

Commit 8f39773

Browse files
committed
refactor(geo): change option name to echartsStyle and enable more style options
1 parent cdb0ebc commit 8f39773

File tree

3 files changed

+86
-42
lines changed

3 files changed

+86
-42
lines changed

src/component/helper/MapDraw.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,9 @@ class MapDraw {
302302
? mapOrGeoModel.getRegionModel(regionName)
303303
: (data ? data.getItemModel(dataIdx) as Model<MapDataItemOption> : null);
304304

305-
// allow specified itemStyle in GeoJSON data
306-
const regionItemStyle = region.properties && region.properties.itemStyle;
307-
if (regionItemStyle) {
308-
const regionModelOption = regionModel.option;
309-
const modelItemStyle = regionModelOption.itemStyle || (regionModelOption.itemStyle = {});
310-
modelItemStyle && zrUtil.defaults(modelItemStyle, regionItemStyle);
311-
}
305+
// allow specified echarts style in GeoJSON data
306+
const specifiedRegionStyle = region.properties && region.properties.echartsStyle;
307+
specifiedRegionStyle && zrUtil.merge(regionModel.option, specifiedRegionStyle);
312308

313309
regionsInfoByName.set(regionName, { dataIdx, regionModel });
314310
}

src/coord/geo/Region.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { GeoJSON, GeoProjection, GeoSVGGraphicRoot } from './geoTypes';
2525
import * as matrix from 'zrender/src/core/matrix';
2626
import type Element from 'zrender/src/Element';
2727
import { each } from 'zrender/src/core/util';
28-
import type { GeoItemStyleOption } from './GeoModel';
28+
import type { RegoinOption } from './GeoModel';
2929

3030
const TMP_TRANSFORM = [] as number[];
3131

@@ -137,7 +137,7 @@ export class GeoJSONRegion extends Region {
137137

138138
// Injected outside.
139139
properties: GeoJSON['features'][0]['properties'] & {
140-
itemStyle?: GeoItemStyleOption
140+
echartsStyle?: Omit<RegoinOption, 'name' | 'selected'>
141141
};
142142

143143
constructor(

test/geo-map.html

Lines changed: 81 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)