Merge pull request #1537 from dataease/pr@dev@fix_panel-filter

fix: 修复编辑文本过滤组件后,显示错位问题
This commit is contained in:
王嘉豪 2021-12-28 12:13:41 +08:00 committed by GitHub
commit e5da7bb582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View File

@ -825,7 +825,7 @@ export default {
}, },
data() { data() {
return { return {
psDebug: false, // psDebug: true, //
editorX: 0, editorX: 0,
editorY: 0, editorY: 0,
start: { // start: { //

View File

@ -313,7 +313,8 @@ export default {
'de-show-date', 'de-show-date',
'de-video' 'de-video'
], ],
enableSureButton: false enableSureButton: false,
filterFromDrag: false
} }
}, },
@ -628,7 +629,7 @@ export default {
if (this.currentWidget.filterDialog) { if (this.currentWidget.filterDialog) {
this.show = false this.show = false
this.openFilterDialog() this.openFilterDialog(true)
return return
} }
component = deepCopy(this.currentFilterCom) component = deepCopy(this.currentFilterCom)
@ -676,7 +677,8 @@ export default {
this.$store.commit('hideContextMenu') this.$store.commit('hideContextMenu')
} }
}, },
openFilterDialog() { openFilterDialog(fromDrag = false) {
this.filterFromDrag = fromDrag
this.filterVisible = true this.filterVisible = true
}, },
closeFilter() { closeFilter() {
@ -686,7 +688,9 @@ export default {
}, },
cancelFilter() { cancelFilter() {
this.closeFilter() this.closeFilter()
bus.$emit('onRemoveLastItem') if(this.filterFromDrag){
bus.$emit('onRemoveLastItem')
}
}, },
sureFilter() { sureFilter() {
this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo() this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo()