From 6ccaf22ee5f7ebb414201e9cf383c0ee72d48c53 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 30 Nov 2022 10:29:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E5=A4=9A=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9C=BA=E6=99=AF=E6=B8=85=E9=99=A4=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E5=90=8E=E6=8C=87=E6=A0=87=E9=80=89=E9=A1=B9=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=8C=87=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/ComponentWrapper.vue     |  8 ++++++--
 .../components/canvas/components/editor/EditBar.vue   | 11 ++++++++++-
 frontend/src/components/deDrag/index.vue              | 10 +++++++---
 .../views/chart/components/map/MapLayerController.vue | 11 ++++++++++-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 18966e10ae..4cd9f3d347 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -13,6 +13,7 @@
       :canvas-id="canvasId"
       :chart="chart"
       :show-position="showPosition"
+      :series-id-map="seriesIdMap"
       @showViewDetails="showViewDetails"
     />
     <div
@@ -149,7 +150,10 @@ export default {
   data() {
     return {
       previewVisible: false,
-      chart: null
+      chart: null,
+      seriesIdMap: {
+        id: ''
+      }
     }
   },
   computed: {
@@ -274,7 +278,7 @@ export default {
       } else {
         return {
           ...
-            getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+          getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
           position: 'relative'
         }
       }
diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue
index bab1c21ef1..698658c3d8 100644
--- a/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/editor/EditBar.vue
@@ -137,13 +137,14 @@
           :target="curComponent.hyperlinks.openMode "
           :href="curComponent.hyperlinks.content "
         >
-          <i class="icon iconfont icon-com-jump"/>
+          <i class="icon iconfont icon-com-jump" />
         </a>
       </span>
 
       <map-layer-controller
         v-if="chart && showMapLayerController"
         :chart="chart"
+        :series-id-map="seriesIdMap"
       />
     </div>
 
@@ -239,6 +240,14 @@ export default {
     chart: {
       type: Object,
       default: null
+    },
+    seriesIdMap: {
+      type: Object,
+      default: () => {
+        return {
+          id: ''
+        }
+      }
     }
   },
   data() {
diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue
index 1fc60a50ab..3ec4ea4362 100644
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@@ -40,6 +40,7 @@
         :canvas-id="canvasId"
         :element="element"
         :chart="chart"
+        :series-id-map="seriesIdMap"
         @showViewDetails="showViewDetails"
         @amRemoveItem="amRemoveItem"
         @amAddItem="amAddItem"
@@ -65,7 +66,7 @@
         @mousedown.stop.prevent="handleDown(handlei, $event)"
         @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
       >
-        <slot :name="handlei"/>
+        <slot :name="handlei" />
       </div>
       <div
         :id="componentCanvasId"
@@ -78,7 +79,7 @@
           class="svg-background"
           :icon-class="mainSlotSvgInner"
         />
-        <slot/>
+        <slot />
       </div>
     </div>
   </div>
@@ -431,7 +432,10 @@ export default {
       // 是否移动 （如果没有移动 不需要记录snapshot）
       hasMove: false,
       // 上次的鼠标指针纵向位置，用来判断指针是上移还是下移
-      latestMoveY: 0
+      latestMoveY: 0,
+      seriesIdMap: {
+        id: ''
+      }
     }
   },
   computed: {
diff --git a/frontend/src/views/chart/components/map/MapLayerController.vue b/frontend/src/views/chart/components/map/MapLayerController.vue
index 57b68c7963..34cb830212 100644
--- a/frontend/src/views/chart/components/map/MapLayerController.vue
+++ b/frontend/src/views/chart/components/map/MapLayerController.vue
@@ -42,6 +42,14 @@ export default {
     chart: {
       type: Object,
       required: true
+    },
+    seriesIdMap: {
+      type: Object,
+      default: () => {
+        return {
+          id: ''
+        }
+      }
     }
   },
   data() {
@@ -79,11 +87,12 @@ export default {
         id: this.chart.id,
         seriesId: this.currentSeriesId
       }
+      this.seriesIdMap.id = this.currentSeriesId
       bus.$emit('change-series-id', param)
     },
 
     init() {
-      this.currentSeriesId = this.customAttr.currentSeriesId
+      this.currentSeriesId = this.seriesIdMap?.id || this.customAttr.currentSeriesId
     }
   }
 }