From 88061a6337cb1444d7f7203a38c4e73fb55c3266 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 30 Jul 2024 17:38:08 +0800
Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B5=81=E5=90=91=E5=9C=B0=E5=9B=BE=E6=A0=87=E6=B3=A8=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FlowMapPointSelector.vue           | 15 ++++++++++++++-
 .../views/chart/components/editor/util/chart.ts   |  2 +-
 .../components/js/panel/charts/map/flow-map.ts    |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue
index f0a98aebb9..34e83b113b 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue
@@ -82,7 +82,7 @@ onMounted(() => {
 
 <template>
   <el-form ref="pointForm" :model="state.pointForm" size="small" label-position="top">
-    <div>
+    <div style="padding-bottom: 8px">
       <el-space>
         <el-form-item class="form-item" :class="'form-item-' + themes" :label="t('chart.text')">
           <el-color-picker
@@ -118,6 +118,19 @@ onMounted(() => {
         </el-form-item>
       </el-space>
     </div>
+    <el-space>
+      <el-form-item class="form-item" :class="'form-item-' + themes" label="标注点气泡颜色">
+        <el-color-picker
+          :effect="themes"
+          size="default"
+          v-model="state.pointForm.point.color"
+          class="color-picker-style"
+          :predefine="predefineColors"
+          @change="changeStyle()"
+          is-custom
+        />
+      </el-form-item>
+    </el-space>
     <div class="alpha-setting">
       <label class="alpha-label" :class="{ dark: 'dark' === themes }"> 标注点气泡大小 </label>
       <el-row style="flex: 1">
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 71d49bda2a..184b0edd7c 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -292,7 +292,7 @@ export const DEFAULT_MISC: ChartMiscAttr = {
         fontSize: 10
       },
       point: {
-        color: 'red',
+        color: '#146C94',
         size: 4,
         animate: false,
         speed: 0.01
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts
index 6f6a848c74..8d7d3c494c 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts
@@ -258,7 +258,7 @@ export class FlowMap extends L7ChartView<Scene, L7Config> {
   }
 
   pointConfig = (chart, xAxis, xAxisExt, misc, configList) => {
-    const color = misc.flowMapConfig.pointConfig.text.color
+    const color = misc.flowMapConfig.pointConfig.point.color
     const size = misc.flowMapConfig.pointConfig.point.size
     const { bubbleCfg } = parseJson(chart.senior)
     const fromDefaultPointLayer = new PointLayer({ zIndex: -1 })