From 4a0e577ad149ce5167fb09c37eb3fd7e4470c14e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 28 Dec 2021 12:12:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Editor/index.vue    |  2 +-
 frontend/src/views/panel/edit/index.vue              | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 70d0ec478e..2b94721d25 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -825,7 +825,7 @@ export default {
   },
   data() {
     return {
-      psDebug: false, // 定位调试模式
+      psDebug: true, // 定位调试模式
       editorX: 0,
       editorY: 0,
       start: { // 选中区域的起点
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index e0e79c5635..8ea2331039 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -313,7 +313,8 @@ export default {
         'de-show-date',
         'de-video'
       ],
-      enableSureButton: false
+      enableSureButton: false,
+      filterFromDrag: false
     }
   },
 
@@ -628,7 +629,7 @@ export default {
 
         if (this.currentWidget.filterDialog) {
           this.show = false
-          this.openFilterDialog()
+          this.openFilterDialog(true)
           return
         }
         component = deepCopy(this.currentFilterCom)
@@ -676,7 +677,8 @@ export default {
         this.$store.commit('hideContextMenu')
       }
     },
-    openFilterDialog() {
+    openFilterDialog(fromDrag = false) {
+      this.filterFromDrag = fromDrag
       this.filterVisible = true
     },
     closeFilter() {
@@ -686,7 +688,9 @@ export default {
     },
     cancelFilter() {
       this.closeFilter()
-      bus.$emit('onRemoveLastItem')
+      if(this.filterFromDrag){
+        bus.$emit('onRemoveLastItem')
+      }
     },
     sureFilter() {
       this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo()