From c93cc4eef44cb28750da82e20c83bcbcc2b67c6f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 20 Jul 2023 14:37:39 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E6=8F=90=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/dragItem/index.vue | 16 +++++++++++++++- .../src/views/panel/filter/FilterDialog.vue | 18 ++++++++++++++++++ .../panel/filter/filterMain/FilterHead.vue | 8 +++++++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/dragItem/index.vue b/frontend/src/components/dragItem/index.vue index ef45d7fca3..a9be8827fe 100644 --- a/frontend/src/components/dragItem/index.vue +++ b/frontend/src/components/dragItem/index.vue @@ -6,7 +6,16 @@ class="item-axis" @close="removeItem" > - {{ item.name }} + + {{ item.name }} + + {{ item.name }} @@ -22,6 +31,11 @@ export default { index: { type: Number, required: true + }, + toolTip: { + type: String, + required: false, + default: '' } }, diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue index 96dd3e5a14..975dc186af 100644 --- a/frontend/src/views/panel/filter/FilterDialog.vue +++ b/frontend/src/views/panel/filter/FilterDialog.vue @@ -266,6 +266,7 @@
stack.push(kid)) + } + } + } + callback && callback(result) + }, async checkSuperior(list, anotherTableIds) { let fieldValid = false const fieldId = this.myAttrs?.fieldId diff --git a/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/frontend/src/views/panel/filter/filterMain/FilterHead.vue index 8be3861cfb..38181d2511 100644 --- a/frontend/src/views/panel/filter/filterMain/FilterHead.vue +++ b/frontend/src/views/panel/filter/filterMain/FilterHead.vue @@ -25,6 +25,7 @@ :key="item.id" :item="item" :index="index" + :tool-tip="getTableName(item.tableId)" @closeItem="closeItem" /> @@ -70,7 +71,12 @@ export default { }, methods: { - + getTableName(tableId) { + let tableName = null + this.$emit('dataset-name', tableId, t => { tableName = t }) + console.log(tableName) + return tableName + }, onMove(e, originalEvent) { return true },