From a44edbb0367caf9ab115978005902d606c2d9bd8 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 27 Apr 2023 11:22:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=99=A8=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DataCollect/Collector/Tree/index.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index f614a4de..ff84153c 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -157,19 +157,17 @@ const defualtDataSource: any = ref(_.cloneDeep(root));
 const defualtParams = {
     paging: false,
     sorts: [{ name: 'createTime', order: 'desc' }],
-    terms: [
+    terms: !!channelId ? [
         {
-            terms: !!channelId
-                ? [
+            terms: [
                       {
                           column: 'channelId',
                           value: channelId,
                       },
-                  ]
-                : [],
+                  ],
             type: 'and',
         },
-    ],
+    ] : [],
 };
 const params = ref();
 

From 816cadbc3b55c37e961df1b60da75cabaf2f66eb Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 27 Apr 2023 11:42:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=90=8E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/menu.ts          |  3 ++-
 src/views/iframe/index.vue | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 0fc4c8e7..f457d5a8 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -280,7 +280,8 @@ export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level =
         icon: route.icon,
         title: route.name,
         hideInMenu: route.isShow === false,
-        buttons: route.buttons?.map((b: any) => b.id) || []
+        buttons: route.buttons?.map((b: any) => b.id) || [],
+        isApp: hasAppId,
       },
     }
 
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
index c1445dc0..2d9f9d92 100644
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -38,10 +38,14 @@ const handle = async (appId: string, url: string) => {
     }
 };
 
+
 watchEffect(() => {
-    const params = route.path.split('/')?.[1];
-    const url = route.path.split('/').slice(2).join('/');
-    handle(params, url);
+    const matchedItem: any = route.matched?.[0]
+    if (matchedItem?.meta?.isApp) {
+      const params = route.path.split('/')?.[1];
+      const url = route.path.split('/').slice(2).join('/');
+      handle(params, url);
+    }
 });
 </script>