From a969aa875e9e30c17c9c9641f7cf4655c6191517 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 9 Jan 2023 16:30:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E8=8C=83=E5=9B=B4=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/filter/FilterDialog.vue          | 2 +-
 .../src/views/panel/filter/filterMain/FilterControl.vue   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue
index 1e201bb583..56a17f654a 100644
--- a/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/frontend/src/views/panel/filter/FilterDialog.vue
@@ -275,7 +275,7 @@
           :control-attrs="myAttrs"
           :child-views="childViews"
           :dataset-params="datasetParams"
-          :activeName="activeName"
+          :active-name="activeName"
         />
 
         <filter-foot :element="currentElement" />
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 846602157d..ac77d2d6ab 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -117,7 +117,7 @@
                 @change="checkedViewsChange"
               >
                 <el-checkbox
-                  v-for="(item ) in childViews.viewInfos"
+                  v-for="(item ) in curTableViews"
                   :key="item.id"
                   :label="item.id"
                   class="de-checkbox"
@@ -308,6 +308,12 @@ export default {
   computed: {
     fieldIds() {
       return this.element.options.attrs.fieldId || []
+    },
+    curTableViews() {
+      const tableIdList = this.element.options.attrs.dragItems.map(item => item.tableId) || []
+
+      const views = this.childViews.viewInfos.filter(view => tableIdList.includes(view.tableId))
+      return views
     }
   },
   watch: {