Merge branch '2.0-bugfix' into dev

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,
       },
     }
 

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();
 

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>