From 2a51b6b00819ce5e92d69b5ed2e7162281a6cf2e Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Mon, 25 Mar 2024 16:09:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=88=97?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A0=B7=E5=BC=8F&=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E7=9A=84=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=8B=89=E5=80=BC=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api-test/components/environmentSelect.vue |  7 +++----
 .../components/management/case/caseDetail.vue |  8 ++++----
 .../components/management/case/caseTable.vue  | 15 +++++++++++----
 .../case/createAndEditCaseDrawer.vue          | 10 ++++++----
 .../case/tabContent/tabCaseExecuteHistory.vue | 19 +++++++++++--------
 .../report/component/reportStatus.vue         |  5 +++++
 6 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/frontend/src/views/api-test/components/environmentSelect.vue b/frontend/src/views/api-test/components/environmentSelect.vue
index fa1b348791..b31ab4f0de 100644
--- a/frontend/src/views/api-test/components/environmentSelect.vue
+++ b/frontend/src/views/api-test/components/environmentSelect.vue
@@ -30,8 +30,7 @@
   const appStore = useAppStore();
   const { openNewPage } = useOpenNewPage();
 
-  const currentEnv = ref('');
-
+  const currentEnv = defineModel<string>('currentEnv', { default: '' });
   const currentEnvConfig = ref<EnvConfig>();
   const envLoading = ref(false);
   const envOptions = ref<SelectOptionData[]>([]);
@@ -54,8 +53,8 @@
         label: item.name,
         value: item.id,
       }));
-      currentEnv.value = res[0]?.id || '';
-      initEnvironment();
+      currentEnv.value = currentEnv.value.length ? currentEnv.value : res[0]?.id;
+      await initEnvironment();
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);
diff --git a/frontend/src/views/api-test/management/components/management/case/caseDetail.vue b/frontend/src/views/api-test/management/components/management/case/caseDetail.vue
index a88b79da80..5e5ae9f326 100644
--- a/frontend/src/views/api-test/management/components/management/case/caseDetail.vue
+++ b/frontend/src/views/api-test/management/components/management/case/caseDetail.vue
@@ -3,7 +3,7 @@
     <a-tabs v-model:active-key="activeKey" class="h-full px-[16px]" animation lazy-load>
       <template #extra>
         <div class="flex gap-[12px]">
-          <environmentSelect v-if="props.isDrawer" ref="environmentSelectRef" />
+          <environmentSelect v-if="props.isDrawer" v-model:current-env="environmentIdByDrawer" />
           <execute
             ref="executeRef"
             v-model:detail="caseDetail"
@@ -116,8 +116,10 @@
   const { openModal } = useModal();
 
   const caseDetail = ref<RequestParam>(cloneDeep(props.detail)); // props.detail是嵌套的引用类型，防止不必要的修改来源影响props.detail的数据
+  const environmentIdByDrawer = ref(props.detail.environmentId);
   watchEffect(() => {
     caseDetail.value = cloneDeep(props.detail); // props.detail是嵌套的引用类型，防止不必要的修改来源影响props.detail的数据
+    environmentIdByDrawer.value = props.detail.environmentId;
   });
 
   const activeKey = ref('detail');
@@ -219,11 +221,9 @@
 
   const protocols = inject<Ref<ProtocolItem[]>>('protocols');
 
-  const environmentSelectRef = ref<InstanceType<typeof environmentSelect>>();
-  const currentEnvConfigByDrawer = computed<EnvConfig | undefined>(() => environmentSelectRef.value?.currentEnvConfig);
   const currentEnvConfigByInject = inject<Ref<EnvConfig>>('currentEnvConfig');
   const environmentId = computed(() =>
-    props.isDrawer ? currentEnvConfigByDrawer.value?.id : currentEnvConfigByInject?.value?.id
+    props.isDrawer ? environmentIdByDrawer.value : currentEnvConfigByInject?.value?.id
   );
 
   const executeRef = ref<InstanceType<typeof execute>>();
diff --git a/frontend/src/views/api-test/management/components/management/case/caseTable.vue b/frontend/src/views/api-test/management/components/management/case/caseTable.vue
index d0f0554817..b1eb5976fd 100644
--- a/frontend/src/views/api-test/management/components/management/case/caseTable.vue
+++ b/frontend/src/views/api-test/management/components/management/case/caseTable.vue
@@ -139,7 +139,7 @@
               <div class="flex items-center justify-center px-[6px] py-[2px]">
                 <a-checkbox-group v-model:model-value="lastReportStatusFilters" direction="vertical" size="small">
                   <a-checkbox v-for="val of lastReportStatusList" :key="val" :value="val">
-                    <span>{{ val }}</span>
+                    <ExecutionStatus :module-type="ReportEnum.API_REPORT" :status="val" />
                   </a-checkbox>
                 </a-checkbox-group>
               </div>
@@ -147,6 +147,9 @@
           </template>
         </a-trigger>
       </template>
+      <template #lastReportStatus="{ record }">
+        <ExecutionStatus :module-type="ReportEnum.API_REPORT" :status="record.lastReportStatus" />
+      </template>
       <template #passRateColumn>
         <div class="flex items-center text-[var(--color-text-3)]">
           {{ t('case.passRate') }}
@@ -316,6 +319,7 @@
   import createAndEditCaseDrawer from './createAndEditCaseDrawer.vue';
   import apiStatus from '@/views/api-test/components/apiStatus.vue';
   import BatchRunModal from '@/views/api-test/components/batchRunModal.vue';
+  import ExecutionStatus from '@/views/api-test/report/component/reportStatus.vue';
 
   import {
     batchDeleteCase,
@@ -339,6 +343,7 @@
   import { ApiCaseDetail } from '@/models/apiTest/management';
   import { DragSortParams } from '@/models/common';
   import { RequestDefinitionStatus } from '@/enums/apiEnum';
+  import { ReportEnum, ReportStatus } from '@/enums/reportEnum';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
   import type { RequestParam } from '@/views/api-test/components/requestComposition/index.vue';
@@ -434,9 +439,9 @@
     {
       title: 'case.lastReportStatus',
       dataIndex: 'lastReportStatus',
+      slotName: 'lastReportStatus',
       titleSlotName: 'lastReportStatusFilter',
       showInTable: false,
-      showTooltip: true,
       width: 150,
     },
     {
@@ -545,8 +550,10 @@
     return caseLevelFields.value?.options || [];
   });
   const lastReportStatusFilterVisible = ref(false);
-  const lastReportStatusList = ['error', 'FakeError', 'success'];
-  const lastReportStatusFilters = ref<string[]>([...lastReportStatusList]);
+  const lastReportStatusList = computed(() => {
+    return Object.keys(ReportStatus[ReportEnum.API_REPORT]);
+  });
+  const lastReportStatusFilters = ref<string[]>(Object.keys(ReportStatus[ReportEnum.API_REPORT]));
 
   async function getModuleIds() {
     let moduleIds: string[] = [];
diff --git a/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue b/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue
index f96ef4fa27..a27134a99c 100644
--- a/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue
+++ b/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue
@@ -34,7 +34,7 @@
                 :max-length="255"
                 show-word-limit
               />
-              <environmentSelect ref="environmentSelectRef" />
+              <environmentSelect v-model:current-env="environmentId" />
               <execute
                 ref="executeRef"
                 v-model:detail="detailForm"
@@ -160,8 +160,8 @@
     },
   ]);
 
-  const environmentSelectRef = ref<InstanceType<typeof environmentSelect>>();
-  const currentEnvConfig = computed<EnvConfig | undefined>(() => environmentSelectRef.value?.currentEnvConfig);
+  const currentEnvConfig = inject<Ref<EnvConfig>>('currentEnvConfig');
+  const environmentId = ref(currentEnvConfig?.value?.id);
 
   const formRef = ref<FormInstance>();
   const requestCompositionRef = ref<InstanceType<typeof requestComposition>>();
@@ -202,10 +202,12 @@
     if (isCopy) {
       detailForm.value.name = `copy_${record?.name}`;
     }
+    environmentId.value = currentEnvConfig?.value?.id;
     // 编辑
     if (!isCopy && record?.id) {
       isEdit.value = true;
       detailForm.value = cloneDeep(record as RequestParam);
+      environmentId.value = record.environmentId;
       detailForm.value.isNew = false;
     }
     innerVisible.value = true;
@@ -231,7 +233,7 @@
         const { name, priority, status, tags, id } = detailForm.value;
         const params: AddApiCaseParams = {
           projectId: appStore.currentProjectId,
-          environmentId: currentEnvConfig.value?.id as string,
+          environmentId: environmentId.value as string,
           apiDefinitionId: apiDefinitionId.value,
           linkFileIds,
           uploadFileIds,
diff --git a/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue b/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue
index c335805081..ec3e15957a 100644
--- a/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue
+++ b/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue
@@ -51,8 +51,8 @@
             <div class="arco-table-filters-content">
               <div class="flex items-center justify-center px-[6px] py-[2px]">
                 <a-checkbox-group v-model:model-value="statusFilters" direction="vertical" size="small">
-                  <a-checkbox v-for="val of Object.values(ExecuteStatusFilters)" :key="val" :value="val">
-                    <execute-status :status="val" />
+                  <a-checkbox v-for="val of statusList" :key="val" :value="val">
+                    <ExecutionStatus :module-type="ReportEnum.API_REPORT" :status="val" />
                   </a-checkbox>
                 </a-checkbox-group>
               </div>
@@ -64,7 +64,7 @@
         <span>{{ t(TriggerModeLabel[record.triggerMode]) }}</span>
       </template>
       <template #status="{ record }">
-        <execute-status :status="record.status" />
+        <ExecutionStatus :status="record.status" :module-type="ReportEnum.API_REPORT" />
       </template>
       <template #operation="{ record }">
         <a-tooltip :disabled="!record.deleted" :content="t('case.detail.report.delete')" position="top">
@@ -105,23 +105,26 @@
   import { MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
   import response from '@/views/api-test/components/requestComposition/response/index.vue';
-  import ExecuteStatus from '@/views/api-test/scenario/components/executeStatus.vue';
+  import ExecutionStatus from '@/views/api-test/report/component/reportStatus.vue';
 
   import { getApiCaseExecuteHistory, getCaseReportDetail, getReportById } from '@/api/modules/api-test/management';
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
 
-  import { ApiCaseReportDetail, RequestResult, RequestTaskResult } from '@/models/apiTest/common';
+  import { ApiCaseReportDetail, RequestTaskResult } from '@/models/apiTest/common';
   import { ApiCaseExecuteHistoryItem } from '@/models/apiTest/management';
-  import { ExecuteStatusFilters, ResponseComposition } from '@/enums/apiEnum';
-  import { TriggerModeLabel } from '@/enums/reportEnum';
+  import { ResponseComposition } from '@/enums/apiEnum';
+  import { ReportEnum, ReportStatus, TriggerModeLabel } from '@/enums/reportEnum';
 
   import { defaultResponse } from '@/views/api-test/components/config';
 
   const triggerModeListFilters = ref<string[]>(Object.keys(TriggerModeLabel));
   const triggerModeFilterVisible = ref(false);
   const statusFilterVisible = ref(false);
-  const statusFilters = ref(Object.keys(ExecuteStatusFilters));
+  const statusFilters = ref<string[]>(Object.keys(ReportStatus[ReportEnum.API_REPORT]));
+  const statusList = computed(() => {
+    return Object.keys(ReportStatus[ReportEnum.API_REPORT]);
+  });
 
   const showResponse = ref(false);
 
diff --git a/frontend/src/views/api-test/report/component/reportStatus.vue b/frontend/src/views/api-test/report/component/reportStatus.vue
index add54eecf4..70c4e3fb6e 100644
--- a/frontend/src/views/api-test/report/component/reportStatus.vue
+++ b/frontend/src/views/api-test/report/component/reportStatus.vue
@@ -73,6 +73,11 @@
         label: 'report.status.pending',
         color: '!text-[var(--color-text-input-border)]',
       },
+      null: {
+        icon: 'icon-icon_block_filled',
+        label: 'report.status.pending',
+        color: '!text-[var(--color-text-input-border)]',
+      },
     },
     [ReportEnum.API_SCENARIO_REPORT]: {
       SUCCESS: {