From 4b7f338a5b4d8b2a0e6033c22868bf6aa7b0bacb Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Thu, 19 Sep 2024 15:11:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8A=A5=E5=91=8A):=20=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E6=8C=89?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046675 --user=白奇 创建自定义报告 时只包括场景用例报告，导出报告仍包括全部 https://www.tapd.cn/55049933/s/1581063
---
 .../test-plan/report/detail/exportPDF.vue     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/test-plan/report/detail/exportPDF.vue b/frontend/src/views/test-plan/report/detail/exportPDF.vue
index 70fad42ee8..dca8fdcda4 100644
--- a/frontend/src/views/test-plan/report/detail/exportPDF.vue
+++ b/frontend/src/views/test-plan/report/detail/exportPDF.vue
@@ -166,6 +166,7 @@
 
   import { BatchApiParams } from '@/models/common';
   import type {
+    componentItem,
     configItem,
     countDetail,
     PlanReportDetail,
@@ -182,6 +183,7 @@
   const route = useRoute();
 
   const innerCardList = ref<configItem[]>([]);
+  const layoutShowCards = ref<componentItem[]>([]);
 
   const detail = ref<PlanReportDetail>({ ...cloneDeep(defaultReportDetail) });
   const reportId = ref<string>(route.query.id as string);
@@ -376,6 +378,7 @@
   async function getDefaultLayout() {
     try {
       const res = await getReportLayout(detail.value.id, shareId.value);
+      layoutShowCards.value = res;
       innerCardList.value = res
         .filter((e: any) => [ReportCardTypeEnum.CUSTOM_CARD, ReportCardTypeEnum.SUMMARY].includes(e.name))
         .map((item: any) => {
@@ -679,7 +682,32 @@
         })) as RowInput[],
       });
     }
-    await Promise.all([initBugList(), initCaseList(), initApiList(), initScenarioList()]);
+    const pageRequest = [];
+    if (
+      isDefaultLayout.value ||
+      (!isDefaultLayout.value && layoutShowCards.value.some((e) => e.name === ReportCardTypeEnum.BUG_DETAIL))
+    ) {
+      pageRequest.push(initBugList());
+    }
+    if (
+      isDefaultLayout.value ||
+      (!isDefaultLayout.value && layoutShowCards.value.some((e) => e.name === ReportCardTypeEnum.FUNCTIONAL_DETAIL))
+    ) {
+      pageRequest.push(initCaseList());
+    }
+    if (
+      isDefaultLayout.value ||
+      (!isDefaultLayout.value && layoutShowCards.value.some((e) => e.name === ReportCardTypeEnum.API_CASE_DETAIL))
+    ) {
+      pageRequest.push(initApiList());
+    }
+    if (
+      !isDefaultLayout.value &&
+      layoutShowCards.value.some((e) => e.name === ReportCardTypeEnum.SCENARIO_CASE_DETAIL)
+    ) {
+      pageRequest.push(initScenarioList());
+    }
+    await Promise.all(pageRequest);
     if (fullBugList.value.length > 0) {
       tableArr.push({
         tableId: 'bug',