dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13445 from dataease/pr@dev-v2@chart-map-fix

Browse Source 
fix(图表): 修复地图没有根据自定义区间变色的问题 #13327
This commit is contained in:
jianneng-fit2cloud 2024-11-20 18:30:38 +08:00 committed by GitHub
commit f031c23920
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,7 +334,8 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
}
}
}
if (!misc.mapAutoLegend && misc.mapLegendRangeType === 'custom') {
// 不是自动图例、自定义图例区间、不是下钻时
if (!misc.mapAutoLegend && misc.mapLegendRangeType === 'custom' && !chart.drill) {
// 获取图例区间数据
const items = []
// 区间数组
@ -342,10 +343,10 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
.slice(0, -1)
.map((item, index) => [item, misc.mapLegendCustomRange[index + 1]])
ranges.forEach((range, index) => {
const tmpRange = [range[0]?.toFixed(0), range[1]?.toFixed(0)]
const tmpRange = [range[0], range[1]]
const colorIndex = index % colors.length
// 当区间第一个值小于最小值时，颜色取地图底色
const isLessThanMin = range[0] < ranges[0][0]
const isLessThanMin = range[0] < ranges[0][0] && range[1] < ranges[0][0]
let rangeColor = colors[colorIndex]
if (isLessThanMin) {
rangeColor = hexColorToRGBA(basicStyle.areaBaseColor, basicStyle.alpha)
@ -361,6 +362,11 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
}
return ''
}
options.color['value'] = ({ value }) => {
const item = items.find(item => value >= item.value[0] && value <= item.value[1])
return item ? item.color : hexColorToRGBA(basicStyle.areaBaseColor, basicStyle.alpha)
}
options.color.scale.domain = [ranges[0][0], ranges[ranges.length - 1][1]]
} else {
customLegend['customContent'] = (_: string, items: CategoryLegendListItem[]) => {
const showItems = items?.length > 30 ? items.slice(0, 30) : items
@ -370,6 +376,12 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
return ''
}
}
// 下钻时按照数据值计算图例
if (chart.drill) {
getMaxAndMinValueByData(options.source.data, 'value', 0, 0, (max, min) => {
options.color.scale.domain = [min, max]
})
}
defaultsDeep(options, { legend: customLegend })
return options
}