forked from github/dataease
Merge pull request #1537 from dataease/pr@dev@fix_panel-filter
fix: 修复编辑文本过滤组件后,显示错位问题
This commit is contained in:
commit
e5da7bb582
@ -825,7 +825,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
psDebug: false, // 定位调试模式
|
psDebug: true, // 定位调试模式
|
||||||
editorX: 0,
|
editorX: 0,
|
||||||
editorY: 0,
|
editorY: 0,
|
||||||
start: { // 选中区域的起点
|
start: { // 选中区域的起点
|
||||||
|
@ -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()
|
||||||
|
Loading…
Reference in New Issue
Block a user