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/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(); 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); + } });