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()