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

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

Browse Source 
feat(图表): 地图、气泡地图的边线以及底色支持配置透明色
This commit is contained in:
jianneng-fit2cloud 2024-11-21 19:36:58 +08:00 committed by GitHub
commit c9d6fd1125
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
View File

@ -706,6 +706,7 @@ onMounted(() => {
v-model="state.basicStyleForm.areaBorderColor" v-model="state.basicStyleForm.areaBorderColor"
:effect="themes" :effect="themes"
is-custom is-custom
show-alpha
:trigger-width="108" :trigger-width="108"
class="color-picker-style" class="color-picker-style"
:predefine="predefineColors" :predefine="predefineColors"
@ -725,6 +726,7 @@ onMounted(() => {
:persistent="false" :persistent="false"
v-model="state.basicStyleForm.areaBaseColor" v-model="state.basicStyleForm.areaBaseColor"
is-custom is-custom
show-alpha
:effect="themes" :effect="themes"
:trigger-width="108" :trigger-width="108"
class="color-picker-style" class="color-picker-style"

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

@ -220,7 +220,7 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
const senior = parseJson(chart.senior) const senior = parseJson(chart.senior)
const curAreaNameMapping = senior.areaMapping?.[areaId] const curAreaNameMapping = senior.areaMapping?.[areaId]
handleGeoJson(geoJson, curAreaNameMapping) handleGeoJson(geoJson, curAreaNameMapping)
options.color = hexColorToRGBA(basicStyle.areaBaseColor, basicStyle.alpha) options.color = basicStyle.areaBaseColor
if (!chart.data?.data?.length || !geoJson?.features?.length) { if (!chart.data?.data?.length || !geoJson?.features?.length) {
options.label && (options.label.field = 'name') options.label && (options.label.field = 'name')
return options return options