From a39ed6a8c0a28679a01aad9012f7ef4f92402105 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 28 Dec 2021 18:09:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/custom-component/UserView.vue     | 6 ++++--
 frontend/src/components/widget/DeWidget/DeSelectGrid.vue    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index a0b1ad9fe7..d4e5a700cf 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -236,7 +236,8 @@ export default {
       'nowPanelJumpInfo',
       'publicLinkStatus',
       'previewCanvasScale',
-      'mobileLayoutStatus'
+      'mobileLayoutStatus',
+      'componentData'
     ])
   },
 
@@ -309,7 +310,8 @@ export default {
   created() {
     this.refId = uuid.v1
     if (this.element && this.element.propValue && this.element.propValue.viewId) {
-      this.getData(this.element.propValue.viewId, false)
+      const hasFilter = this.componentData.filter(item => item.type === 'custom').some(item => item.options.value)
+      hasFilter || this.getData(this.element.propValue.viewId, false)
     }
   },
   methods: {
diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index b2d842e3b7..ed0b1fbb1e 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -17,13 +17,13 @@
           {{ $t('commons.all') }}</el-checkbox>
 
         <el-checkbox-group v-model="value" @change="handleCheckedChange">
-          <el-checkbox v-for="item in datas" :key="item.id" :label="item.id">{{ item.id }}</el-checkbox>
+          <el-checkbox v-for="item in datas.filter(node => node.id && node.id.includes(keyWord))" :key="item.id" :label="item.id">{{ item.id }}</el-checkbox>
         </el-checkbox-group>
       </div>
 
       <div v-else class="radio-group-container">
         <el-radio-group v-model="value" @change="changeRadioBox">
-          <el-radio v-for="(item, index) in datas" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
+          <el-radio v-for="(item, index) in datas.filter(node => node.id && node.id.includes(keyWord))" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
             <span>{{ item.id }}</span>
           </el-radio>
         </el-radio-group>