From b93a9bdf8f6ced3ad58e8e30cd9ca7adc9f4f49f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 12 Dec 2022 13:29:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=89=93=E5=BC=80=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=EF=BC=8C=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=87=E6=BB=A4=20Tab=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E7=9A=84=E8=A7=86=E5=9B=BE=20#4011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/utils/conditionUtil.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/utils/conditionUtil.js b/frontend/src/utils/conditionUtil.js
index 5cbd3ecbea..3b3e0f1240 100644
--- a/frontend/src/utils/conditionUtil.js
+++ b/frontend/src/utils/conditionUtil.js
@@ -1,6 +1,6 @@
-
 import { Condition } from '@/components/widget/bean/Condition'
 import { ApplicationContext } from '@/utils/ApplicationContext'
+import store from '@/store'
 
 /**
  * 判断两个conditions数组是否相同
@@ -70,7 +70,11 @@ export const buildViewKeyMap = panelItems => {
 }
 
 export const buildViewKeyFilters = (panelItems, result) => {
-  panelItems.forEach((element, index) => {
+  if (!(panelItems && panelItems.length > 0)) {
+    return result
+  }
+  const buildItems = panelItems[0].canvasId === 'canvas-main' ? panelItems : store.state.componentData
+  buildItems.forEach((element, index) => {
     if (element.type !== 'custom') {
       return true
     }