From 09d8a97398a93d7d1b2212b9083917f4c4583779 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Mon, 17 Jun 2024 14:05:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20=E9=83=A8=E5=88=86bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/models/apiTest/scenario.ts         |  1 +
 .../api-test/report/component/reportStatus.vue  |  2 +-
 .../scenario/components/scenarioTable.vue       | 17 +++++++++++++++++
 frontend/src/views/api-test/scenario/index.vue  | 13 +++++++++++--
 .../views/setting/system/config/locale/zh-CN.ts |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/frontend/src/models/apiTest/scenario.ts b/frontend/src/models/apiTest/scenario.ts
index f4cbc311d2..67ed8cfe62 100644
--- a/frontend/src/models/apiTest/scenario.ts
+++ b/frontend/src/models/apiTest/scenario.ts
@@ -95,6 +95,7 @@ export interface ApiScenarioTableItem {
   status: RequestDefinitionStatus;
   customFields: ApiDefinitionCustomField[];
   scheduleConfig?: ApiScenarioScheduleConfig;
+  lastReportId?: string;
 }
 
 // 场景列表查询参数
diff --git a/frontend/src/views/api-test/report/component/reportStatus.vue b/frontend/src/views/api-test/report/component/reportStatus.vue
index 332e7d7ed6..47a3e8f954 100644
--- a/frontend/src/views/api-test/report/component/reportStatus.vue
+++ b/frontend/src/views/api-test/report/component/reportStatus.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex items-center justify-start">
-    <MsIcon :type="getExecutionResult().icon" :class="getExecutionResult()?.color" size="14" />
+    <MsIcon :type="getExecutionResult().icon || '-'" :class="getExecutionResult()?.color" size="14" />
     <span class="ml-1">{{ t(getExecutionResult().label) }}</span>
     <a-tooltip v-if="props.scriptIdentifier" :content="getMsg()">
       <MsTag
diff --git a/frontend/src/views/api-test/scenario/components/scenarioTable.vue b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
index 2b20d24f38..f40e961326 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioTable.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
@@ -132,6 +132,8 @@
           :module-type="ReportEnum.API_SCENARIO_REPORT"
           :status="record.lastReportStatus ? record.lastReportStatus : 'PENDING'"
           :script-identifier="record.scriptIdentifier"
+          :class="record.lastReportId ? 'cursor-pointer' : ''"
+          @click="openScenarioReportDrawer(record)"
         />
       </template>
       <template #stepTotal="{ record }">
@@ -483,6 +485,12 @@
     :batch-run-func="batchRunScenario"
     @finished="loadScenarioList"
   />
+  <!-- 场景报告抽屉 -->
+  <caseAndScenarioReportDrawer
+    v-model:visible="showScenarioReportVisible"
+    is-scenario
+    :report-id="tableRecord?.lastReportId || ''"
+  />
 </template>
 
 <script setup lang="ts">
@@ -502,6 +510,7 @@
   import type { CaseLevel } from '@/components/business/ms-case-associate/types';
   import type { MsTreeNodeData } from '@/components/business/ms-tree/types';
   import apiStatus from '@/views/api-test/components/apiStatus.vue';
+  import caseAndScenarioReportDrawer from '@/views/api-test/components/caseAndScenarioReportDrawer.vue';
   import ExecutionStatus from '@/views/api-test/report/component/reportStatus.vue';
   import BatchRunModal from '@/views/api-test/scenario/components/batchRunModal.vue';
   import operationScenarioModuleTree from '@/views/api-test/scenario/components/operationScenarioModuleTree.vue';
@@ -1431,6 +1440,14 @@
     }
   }
 
+  const showScenarioReportVisible = ref(false);
+  function openScenarioReportDrawer(record: ApiScenarioTableItem) {
+    if (record.lastReportId) {
+      tableRecord.value = record;
+      showScenarioReportVisible.value = true;
+    }
+  }
+
   onBeforeMount(() => {
     loadScenarioList();
   });
diff --git a/frontend/src/views/api-test/scenario/index.vue b/frontend/src/views/api-test/scenario/index.vue
index a0c7db0872..34c353037c 100644
--- a/frontend/src/views/api-test/scenario/index.vue
+++ b/frontend/src/views/api-test/scenario/index.vue
@@ -501,8 +501,16 @@
     recycleModulesCount.value = res.all;
   }
 
-  function refreshTree(params: ApiScenarioGetModuleParams) {
-    scenarioModuleTreeRef.value?.initModuleCount(params);
+  const tempTableQueryParams = ref<ApiScenarioGetModuleParams>();
+  function refreshTree(params?: ApiScenarioGetModuleParams) {
+    tempTableQueryParams.value = params;
+    if (params) {
+      scenarioModuleTreeRef.value?.initModuleCount(params);
+    } else {
+      scenarioModuleTreeRef.value?.initModuleCount({
+        projectId: appStore.currentProjectId,
+      });
+    }
     selectRecycleCount();
   }
 
@@ -621,6 +629,7 @@
           }),
         });
       }
+      refreshTree(tempTableQueryParams.value);
       Message.success(activeScenarioTab.value.isNew ? t('common.createSuccess') : t('common.saveSuccess'));
       activeScenarioTab.value.unSaved = false;
       saveLoading.value = false;
diff --git a/frontend/src/views/setting/system/config/locale/zh-CN.ts b/frontend/src/views/setting/system/config/locale/zh-CN.ts
index 0fc974f680..0bd540e6ba 100644
--- a/frontend/src/views/setting/system/config/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/config/locale/zh-CN.ts
@@ -2,7 +2,7 @@ export default {
   'system.config.parameterConfig': '系统参数配置',
   'system.config.baseConfig': '基础设置',
   'system.config.pageConfig': '界面设置',
-  'system.config.qrCodeConfig': '扫码登陆',
+  'system.config.qrCodeConfig': '扫码登录',
   'system.config.authConfig': '认证设置',
   'system.config.baseInfo': '基本信息',
   'system.config.update': '更新',