From 613ee0881b2179fbb6622b99c3cc263c5c1ad112 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Thu, 29 Aug 2024 10:49:28 +0800
Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8-=E6=B5=81=E5=90=91?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE):=20=E6=A0=87=E6=B3=A8=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=87=E6=B3=A8=E7=82=B9=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/FlowMapLineSelector.vue      | 8 ++------
 .../editor-style/components/FlowMapPointSelector.vue     | 9 +++++++--
 .../src/views/chart/components/editor/util/chart.ts      | 4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapLineSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapLineSelector.vue
index fd533c2c3c..f87efaa7a5 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapLineSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapLineSelector.vue
@@ -31,12 +31,8 @@ const flowLineTypeOptions = [
   { name: t('chart.map_line_type_arc_3d'), value: 'arc3d' }
 ]
 const state = reactive({
-  lineForm: {
-    ...JSON.parse(JSON.stringify(DEFAULT_MISC.flowMapConfig.lineConfig))
-  },
-  basicStyleForm: {
-    ...JSON.parse(JSON.stringify(DEFAULT_BASIC_STYLE))
-  }
+  lineForm: {},
+  basicStyleForm: {}
 })
 const toolTip = computed(() => {
   return props.themes === 'dark' ? 'ndark' : 'dark'
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 4ff853c0ee..aee6efc12e 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
@@ -1,9 +1,10 @@
 <script lang="tsx" setup>
-import { computed, onMounted, PropType, reactive, watch } from 'vue'
+import { computed, nextTick, onMounted, PropType, reactive, watch } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { COLOR_PANEL, DEFAULT_MISC } from '@/views/chart/components/editor/util/chart'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { ElSpace } from 'element-plus-secondary'
+import { cloneDeep } from 'lodash-es'
 
 const { t } = useI18n()
 const dvMainStore = dvMainStoreWithOut()
@@ -63,7 +64,11 @@ const init = () => {
       customAttr = JSON.parse(chart.customAttr)
     }
     if (customAttr.misc.flowMapConfig.lineConfig) {
-      state.pointForm = customAttr.misc.flowMapConfig.pointConfig
+      state.pointForm = cloneDeep(customAttr.misc.flowMapConfig.pointConfig)
+      nextTick(() => {
+        state.pointForm.point.color = customAttr.misc.flowMapConfig.pointConfig.point.color
+        state.pointForm.text.color = customAttr.misc.flowMapConfig.pointConfig.text.color
+      })
     } else {
       // 新增图表
       state.pointForm = {
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 bdf31d9b08..5a46206f23 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
@@ -282,8 +282,8 @@ export const DEFAULT_MISC: ChartMiscAttr = {
       mapLineWidth: 1,
       mapLineAnimateDuration: 3,
       mapLineGradient: false,
-      mapLineSourceColor: '#146C94',
-      mapLineTargetColor: '#576CBC',
+      mapLineSourceColor: '#1E90FF',
+      mapLineTargetColor: '#90EE90',
       alpha: 100
     },
     pointConfig: {