From 7287c92ae09d2e4853b8b4efcd84ab0edaa0758c Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 9 Oct 2024 17:25:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=95=B4=E4=BD=93=E5=A1=AB=E5=85=85=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts                  | 2 +-
 .../editor-style/components/BasicStyleSelector.vue       | 2 ++
 .../chart/components/js/panel/charts/map/bubble-map.ts   | 3 ++-
 .../views/chart/components/js/panel/charts/map/map.ts    | 9 ++++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 80ee010ff1..8c463de1ef 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -754,7 +754,7 @@ export default {
     color_simple: '简洁',
     not_alpha: '不透明度',
     area_border_color: '地图边线',
-    area_base_color: '底图',
+    area_base_color: '地图区块填充',
     size: '大小',
     bar_width: '柱宽',
     bar_gap: '柱间隔',
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 9c50a9278b..afa9b43ff5 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
@@ -585,6 +585,8 @@ onMounted(() => {
           />
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row :gutter="8">
       <el-col :span="12" v-if="showProperty('areaBaseColor')">
         <el-form-item
           :label="t('chart.area_base_color')"
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 6907d8db58..5a9f799037 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
@@ -32,7 +32,8 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
   properties: EditorProperty[] = [...MAP_EDITOR_PROPERTY, 'bubble-animate']
   propertyInner = {
     ...MAP_EDITOR_PROPERTY_INNER,
-    'tooltip-selector': [...MAP_EDITOR_PROPERTY_INNER['tooltip-selector'], 'carousel']
+    'tooltip-selector': [...MAP_EDITOR_PROPERTY_INNER['tooltip-selector'], 'carousel'],
+    'basic-style-selector': [...MAP_EDITOR_PROPERTY_INNER['basic-style-selector'], 'areaBaseColor']
   }
   axis = MAP_AXIS_TYPE
   axisConfig: AxisConfig = {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
index cb14b0dcb5..a78bc08842 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
@@ -46,7 +46,14 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
   properties: EditorProperty[] = [...MAP_EDITOR_PROPERTY, 'legend-selector']
   propertyInner: EditorPropertyInner = {
     ...MAP_EDITOR_PROPERTY_INNER,
-    'basic-style-selector': ['colors', 'alpha', 'areaBorderColor', 'zoom', 'gradient-color'],
+    'basic-style-selector': [
+      'colors',
+      'alpha',
+      'areaBorderColor',
+      'areaBaseColor',
+      'zoom',
+      'gradient-color'
+    ],
     'legend-selector': ['icon', 'fontSize', 'color'],
     'tooltip-selector': [...MAP_EDITOR_PROPERTY_INNER['tooltip-selector'], 'carousel']
   }