center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #8528 from dataease/pr@dev-v2@fix_bubble_map_size

Browse Source 
fix(图表): 修复气泡地图显示异常
This commit is contained in:
wisonic-s 2024-03-14 18:49:32 +08:00 committed by GitHub
commit b835d953a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts
View File

@ -100,7 +100,7 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
}
options = this.setupOptions(chart, options, drawOption, geoJson)
const view = new Choropleth(container, options)
const dotLayer = this.getDotLayer(chart, chart.data?.data, geoJson)
const dotLayer = this.getDotLayer(chart, geoJson, drawOption)
view.once('loaded', () => {
view.addLayer(dotLayer)
view.on('fillAreaLayer:click', (ev: MapMouseEvent) => {
@ -118,8 +118,12 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
return view
}
private getDotLayer(chart: Chart, data: any[], geoJson: FeatureCollection): IPlotLayer {
const areaMap = data?.reduce((obj, value) => {
private getDotLayer(
chart: Chart,
geoJson: FeatureCollection,
drawOption: L7PlotDrawOptions<Choropleth>
): IPlotLayer {
const areaMap = chart.data?.data?.reduce((obj, value) => {
obj[value['field']] = value.value
return obj
}, {})
@ -135,6 +139,7 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
}
})
const { basicStyle } = parseJson(chart.customAttr)
const { offsetHeight, offsetWidth } = document.getElementById(drawOption.container)
const options: DotLayerOptions = {
source: {
data: dotData,
@ -146,7 +151,8 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
},
shape: 'circle',
size: {
field: 'size'
field: 'size',
value: [5, Math.min(offsetHeight, offsetWidth) / 20]
},
visible: true,
zIndex: 0.05,