diff --git a/frontend/src/components/elVisualSelect/index.vue b/frontend/src/components/elVisualSelect/index.vue index d05209996f..4f1091c296 100644 --- a/frontend/src/components/elVisualSelect/index.vue +++ b/frontend/src/components/elVisualSelect/index.vue @@ -270,7 +270,5 @@ export default { .select-all { padding: 10px 20px 0 20px; } -.coustom-de-select { - z-index: 999 !important; -} + diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue index 41b685f2bc..fe04b0923d 100644 --- a/frontend/src/views/panel/filter/FilterDialog.vue +++ b/frontend/src/views/panel/filter/FilterDialog.vue @@ -567,6 +567,7 @@ export default { const data = res.data this.viewInfos = data + this.updateParentName() this.childViews.viewInfos = data }) var type = 'TEXT' @@ -582,6 +583,17 @@ export default { this.childViews.datasetParams = data }) }, + updateParentName() { + if (this.fieldsParent && this.viewInfos?.length && this.activeName !== 'dataset') { + this.viewInfos.forEach(info => { + if (info.id === this.fieldsParent.id && info.name !== this.fieldsParent.name) { + this.fieldsParent.name = info.name + this.comBackLink(this.fieldsParent) + this.comShowFieldData(this.fieldsParent) + } + }) + } + }, handleNodeClick(data) { if (data.modelInnerType !== 'group') { this.showFieldData(data)