From 9eda656e503a357db84e08f50e601d35ed94f596 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 27 Aug 2024 10:32:41 +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=B7=BB=E5=8A=A0=E7=BA=BF=E6=9D=A1?=
 =?UTF-8?q?=E7=B2=97=E7=BB=86=E6=B3=A8=E9=87=8A=E5=9B=BE=E6=A0=87=E5=8F=8A?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E9=85=8D=E7=BD=AE=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FlowMapPointSelector.vue       |  2 +-
 .../views/chart/components/editor/index.vue   | 22 +++++++++++++++++--
 .../js/panel/charts/map/flow-map.ts           |  3 ++-
 3 files changed, 23 insertions(+), 4 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 34e83b113b..4ff853c0ee 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
@@ -84,7 +84,7 @@ onMounted(() => {
   <el-form ref="pointForm" :model="state.pointForm" size="small" label-position="top">
     <div style="padding-bottom: 8px">
       <el-space>
-        <el-form-item class="form-item" :class="'form-item-' + themes" :label="t('chart.text')">
+        <el-form-item class="form-item" :class="'form-item-' + themes" label="标注点文本">
           <el-color-picker
             :effect="themes"
             size="default"
diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index 273cf2e68f..3f5beced93 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -2219,8 +2219,26 @@ const deleteChartFieldItem = id => {
                         <!--yAxis-->
                         <el-row v-if="showAxis('yAxis')" class="padding-lr drag-data">
                           <div class="form-draggable-title">
-                            <span>
-                              {{ chartViewInstance.axisConfig.yAxis.name }}
+                            <span class="data-area-label">
+                              <span style="margin-right: 4px">
+                                {{ chartViewInstance.axisConfig.yAxis.name }}
+                              </span>
+                              <el-tooltip
+                                v-if="chartViewInstance.axisConfig.yAxis.tooltip"
+                                class="item"
+                                :effect="toolTip"
+                                placement="top"
+                              >
+                                <template #content>
+                                  <span> {{ chartViewInstance.axisConfig.yAxis.tooltip }}</span>
+                                </template>
+                                <el-icon
+                                  class="hint-icon"
+                                  :class="{ 'hint-icon--dark': themes === 'dark' }"
+                                >
+                                  <Icon name="icon_info_outlined" />
+                                </el-icon>
+                              </el-tooltip>
                             </span>
                             <el-tooltip
                               :effect="toolTip"
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 3ac0b2f8a9..c35cb138dc 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
@@ -57,7 +57,8 @@ export class FlowMap extends L7ChartView<Scene, L7Config> {
     yAxis: {
       name: `线条粗细 / ${t('chart.quota')}`,
       type: 'q',
-      limit: 1
+      limit: 1,
+      tooltip: '该指标生效时，样式中线条配置的线条宽度属性将失效'
     }
   }
   constructor() {