From dc9edd9fdc2dc0fb551f893ba1a20e826a31ea59 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 13 Jun 2024 18:57:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=92=8C?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E7=94=A8=E4=BE=8B=E6=98=8E=E7=BB=86table&?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83style=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskCenter/component/taskCom.vue          |  4 +++-
 ...iCaseTable.vue => apiAndScenarioTable.vue} | 20 +++++++++++++++++--
 .../report/detail/component/planDetail.vue    | 11 ++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)
 rename frontend/src/views/test-plan/report/detail/component/{apiCaseTable.vue => apiAndScenarioTable.vue} (89%)

diff --git a/frontend/src/views/project-management/taskCenter/component/taskCom.vue b/frontend/src/views/project-management/taskCenter/component/taskCom.vue
index b4f6afeef8..e4ef2e1637 100644
--- a/frontend/src/views/project-management/taskCenter/component/taskCom.vue
+++ b/frontend/src/views/project-management/taskCenter/component/taskCom.vue
@@ -4,7 +4,7 @@
       <div
         v-for="item of menuTab"
         :key="item.value"
-        :class="`${activeTask === item.value ? 'active' : ''} item flex items-center`"
+        :class="`${activeTask === item.value ? 'active' : ''} item`"
         @click="toggleTask(item.value)"
       >
         <div class="mr-2">
@@ -199,6 +199,8 @@
       height: 100%;
       border-right: 1px solid var(--color-text-n8);
       .item {
+        display: flex;
+        align-items: center;
         padding: 0 20px;
         height: 38px;
         font-size: 14px;
diff --git a/frontend/src/views/test-plan/report/detail/component/apiCaseTable.vue b/frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue
similarity index 89%
rename from frontend/src/views/test-plan/report/detail/component/apiCaseTable.vue
rename to frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue
index 213052385e..2ea344b511 100644
--- a/frontend/src/views/test-plan/report/detail/component/apiCaseTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue
@@ -24,7 +24,12 @@
       /> -->
     </template>
   </MsBaseTable>
-  <CaseAndScenarioReportDrawer v-model:visible="reportVisible" :report-id="apiReportId" do-not-show-share />
+  <CaseAndScenarioReportDrawer
+    v-model:visible="reportVisible"
+    :is-scenario="props.activeTab === 'scenarioCase'"
+    :report-id="apiReportId"
+    do-not-show-share
+  />
 </template>
 
 <script setup lang="ts">
@@ -36,7 +41,7 @@
   import ExecuteResult from '@/components/business/ms-case-associate/executeResult.vue';
   import CaseAndScenarioReportDrawer from '@/views/api-test/components/caseAndScenarioReportDrawer.vue';
 
-  import { getApiPage, getShareApiPage } from '@/api/modules/test-plan/report';
+  import { getApiPage, getScenarioPage, getShareApiPage, getShareScenarioPage } from '@/api/modules/test-plan/report';
 
   import { ApiOrScenarioCaseItem } from '@/models/testPlan/report';
   import { LastExecuteResults } from '@/enums/caseEnum';
@@ -49,6 +54,7 @@
   const props = defineProps<{
     reportId: string;
     shareId?: string;
+    activeTab: string;
   }>();
 
   const columns: MsTableColumn = [
@@ -121,6 +127,9 @@
     },
   ];
   const reportApiList = () => {
+    if (props.activeTab === 'scenarioCase') {
+      return !props.shareId ? getShareScenarioPage : getScenarioPage;
+    }
     return !props.shareId ? getShareApiPage : getApiPage;
   };
   const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(
@@ -159,4 +168,11 @@
     reportVisible.value = true;
     apiReportId.value = record.reportId;
   }
+
+  watch(
+    () => props.activeTab,
+    () => {
+      loadCaseList();
+    }
+  );
 </script>
diff --git a/frontend/src/views/test-plan/report/detail/component/planDetail.vue b/frontend/src/views/test-plan/report/detail/component/planDetail.vue
index 312585b14a..3f9d89852a 100644
--- a/frontend/src/views/test-plan/report/detail/component/planDetail.vue
+++ b/frontend/src/views/test-plan/report/detail/component/planDetail.vue
@@ -131,8 +131,12 @@
     />
     <BugTable v-if="activeTab === 'bug'" :report-id="detail.id" :share-id="shareId" />
     <FeatureCaseTable v-if="activeTab === 'featureCase'" :report-id="detail.id" :share-id="shareId" />
-    <ApiCaseTable v-if="activeTab === 'apiCase'" :report-id="detail.id" :share-id="shareId" />
-    <ScenarioCaseTable v-if="activeTab === 'scenarioCase'" :report-id="detail.id" :share-id="shareId" />
+    <ApiAndScenarioTable
+      v-if="activeTab === 'apiCase'"
+      :report-id="detail.id"
+      :share-id="shareId"
+      :active-tab="activeTab"
+    />
   </MsCard>
 </template>
 
@@ -149,11 +153,10 @@
   import ReportMetricsItem from './ReportMetricsItem.vue';
   import SetReportChart from '@/views/api-test/report/component/case/setReportChart.vue';
   import SingleStatusProgress from '@/views/test-plan/report/component/singleStatusProgress.vue';
-  import ApiCaseTable from '@/views/test-plan/report/detail/component/apiCaseTable.vue';
+  import ApiAndScenarioTable from '@/views/test-plan/report/detail/component/apiAndScenarioTable.vue';
   import BugTable from '@/views/test-plan/report/detail/component/bugTable.vue';
   import FeatureCaseTable from '@/views/test-plan/report/detail/component/featureCaseTable.vue';
   import ReportHeader from '@/views/test-plan/report/detail/component/reportHeader.vue';
-  import ScenarioCaseTable from '@/views/test-plan/report/detail/component/scenarioCaseTable.vue';
   import Summary from '@/views/test-plan/report/detail/component/summary.vue';
 
   import { updateReportDetail } from '@/api/modules/test-plan/report';