From 5c10b2b8c2bd3064283034124f78339fbed12129 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 14 Mar 2024 18:48:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/js/panel/charts/map/bubble-map.ts   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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 c4a59fb7c8..4b91a38aa6 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
@@ -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,