github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13193 from dataease/pr@dev-v2@chart-map-tooltip-style

Browse Source 
style(图表): 优化地图轮播提示的代码
This commit is contained in:
jianneng-fit2cloud 2024-11-07 10:24:34 +08:00 committed by GitHub
commit 95d5d949ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
})
dotLayer.once('loaded', () => {
chart.container = container
configCarouselTooltip(chart, view, chart.data?.data || [], null, areaId)
configCarouselTooltip(chart, view, chart.data?.data || [], null)
})
})
return view

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

@ -178,7 +178,7 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
})
})
chart.container = container
configCarouselTooltip(chart, view, data, null, areaId)
configCarouselTooltip(chart, view, data, null)
})
return view
}

10
core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts
View File

@ -6,19 +6,13 @@ import { parseJson } from '@/views/chart/components/js/util'
import { Scene } from '@antv/l7-scene'
import { deepCopy } from '@/utils/utils'
export const configCarouselTooltip = (chart, view, data, scene, areaId?) => {
export const configCarouselTooltip = (chart, view, data, scene) => {
if (['bubble-map', 'map'].includes(chart.type)) {
data = view.source.data.dataArray
?.filter(i => i.dimensionList?.length > 0)
.reduce((acc, current) => {
const existingItem = acc.find(obj => {
if (areaId.startsWith('000')) {
return obj.name === current.name
} else if (areaId.startsWith('156')) {
return obj.adcode === current.adcode
} else {
return obj.name === current.name
}
return obj.name === current.name || (obj.adcode && obj.adcode === current.adcode)
})
if (!existingItem) {
acc.push(current)