From dab778b109fa5e55768d90bdeef8188a8800fa96 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 Aug 2021 14:46:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B0=B8=E8=BF=9C=E5=9C=A8=E6=9C=80=E4=B8=8A=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue                   | 3 ++-
 frontend/src/components/canvas/components/Editor/index.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 300e8c53c3..eefbe0ffc2 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -20,7 +20,7 @@
     @mouseenter="enter"
     @mouseleave="leave"
   >
-    <edit-bar v-if="active||linkageSettingStatus" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
+    <edit-bar style="transform: translateZ(10px)" v-if="active||linkageSettingStatus" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
     <div
       v-for="(handlei, indexi) in actualHandles"
       :key="indexi"
@@ -1566,6 +1566,7 @@ export default {
 .vdr {
   touch-action: none;
   position: absolute;
+  transform-style:preserve-3d;
   border: 1px
 }
 
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 57b2a8de21..efc45fe8b8 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -637,6 +637,7 @@ export default {
     /*background: #fff;*/
     margin: auto;
     background-size:100% 100% !important;
+    transform-style:preserve-3d;
 
     .lock {
         opacity: .5;

From 9d0951bca380a7465bae3fe927c66a1da5b5d37b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 Aug 2021 15:10:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=B8=85=E9=99=A4=E8=81=94=E5=8A=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index b9b876dea1..46370c74d9 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -243,7 +243,7 @@ const data = {
           item.linkageFilters.splice(0, item.linkageFilters.length)
         }
       })
-      state.styleChangeTimes++
+      // state.styleChangeTimes++
     }
   },
   modules: {

From 523ff395f5a869b4fa246a86222a6bfed428737e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 Aug 2021 15:51:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor:=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=94=BE=E7=9D=80transfrom=E4=BD=BFz-index?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/index.vue           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index efc45fe8b8..a8b3e2af37 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -3,7 +3,12 @@
     v-if="showDrag"
     id="editor"
     class="editor"
-    :class="{ edit: isEdit }"
+    :class="[
+      {
+        ['edit']: isEdit ,
+        ['parent_transform']:!chartDetailsVisible
+      }
+    ]"
     :style="customStyle"
     @mousedown="handleMouseDown"
   >
@@ -167,6 +172,7 @@ export default {
   props: {
     isEdit: {
       type: Boolean,
+      require: false,
       default: true
     },
 
@@ -637,12 +643,16 @@ export default {
     /*background: #fff;*/
     margin: auto;
     background-size:100% 100% !important;
-    transform-style:preserve-3d;
-
+    /*transform-style:preserve-3d;*/
     .lock {
         opacity: .5;
     }
 }
+.parent_transform {
+  //transform transform 会使z-index 失效；为了使编辑仪表板时 按钮一直在上面 采用transform-style 的方式
+  // transform-style 会导致 dialog 遮罩有问题 此处暂时用这个样式做控制
+  transform-style:preserve-3d;
+}
 .edit {
     outline: 1px solid gainsboro;
     .component {