From 6b4c9e0f843ff2d8913e5d8ca8d530707c4d16da Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 23 Mar 2023 17:25:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E4=B8=AD=E4=B8=8B=E6=8B=89=E5=A4=87=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/elVisualSelect/index.vue | 4 +--- frontend/src/views/panel/filter/FilterDialog.vue | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) 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)