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