From ae5cc25d8af8e1dff129f0ecf88bb398ec3f73a3 Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Mon, 1 Aug 2022 18:39:05 +0800
Subject: [PATCH] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E3=80=81=E8=81=94=E5=8A=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E6=8B=A9=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=20(#2755)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(仪表板): 主题色更换保留原标题显示方式

* refator(仪表板): 主题色切换，过滤组件默认颜色设置

* refator(仪表板): 主题色切换，适配tab组件

* refactor(仪表板): 符号地图适配主题变化

* style(仪表板): 批量设置、联动设置选择按钮位置变更

Co-authored-by: wangjiahao <1522128093@qq.com>
---
 frontend/src/components/canvas/components/Editor/EditBar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 387363fd08..1f9efcce4d 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -101,7 +101,7 @@ export default {
   },
   computed: {
     showEditPosition() {
-      if (this.activeModel === 'edit') {
+      if (this.activeModel === 'edit' && !this.linkageAreaShow && !this.batchOptAreaShow) {
         const toRight = (this.canvasStyleData.width - this.element.style.left - this.element.style.width) * this.curCanvasScale.scalePointWidth
         const toLeft = this.element.style.left * this.curCanvasScale.scalePointWidth
         if (this.barWidth < toRight) {
@@ -183,7 +183,7 @@ export default {
         this.$store.commit('addCurMultiplexingComponent', { 'component': this.element, 'componentId': this.element.id })
       } else {
         // remove
-        this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id )
+        this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id)
       }
     },
     closePreview() {