From 88c658aaedaa17b8d1a315c000340f7406fddecf Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Thu, 21 Nov 2024 19:35:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E3=80=81=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE=E7=9A=84=E8=BE=B9?= =?UTF-8?q?=E7=BA=BF=E4=BB=A5=E5=8F=8A=E5=BA=95=E8=89=B2=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=8F=E6=98=8E=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor/editor-style/components/BasicStyleSelector.vue | 2 ++ .../views/chart/components/js/panel/charts/map/bubble-map.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue index 9792a24d4a..83af8f6ea6 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue @@ -706,6 +706,7 @@ onMounted(() => { v-model="state.basicStyleForm.areaBorderColor" :effect="themes" is-custom + show-alpha :trigger-width="108" class="color-picker-style" :predefine="predefineColors" @@ -725,6 +726,7 @@ onMounted(() => { :persistent="false" v-model="state.basicStyleForm.areaBaseColor" is-custom + show-alpha :effect="themes" :trigger-width="108" class="color-picker-style" diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts index 4d17ae08f5..7542b16ea7 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts @@ -220,7 +220,7 @@ export class BubbleMap extends L7PlotChartView { const senior = parseJson(chart.senior) const curAreaNameMapping = senior.areaMapping?.[areaId] handleGeoJson(geoJson, curAreaNameMapping) - options.color = hexColorToRGBA(basicStyle.areaBaseColor, basicStyle.alpha) + options.color = basicStyle.areaBaseColor if (!chart.data?.data?.length || !geoJson?.features?.length) { options.label && (options.label.field = 'name') return options