From 717e3ae39604048dc9eeb7d9f5b4941d79cf093b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 14 Mar 2024 18:11:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E8=B4=A5=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdk/dto/api/result/ProcessResultDTO.java  |  3 +++
 .../api-test/report/component/reportList.vue  | 10 +++++---
 .../report/component/reportStatus.vue         | 23 +++++++++++++++++++
 .../src/views/api-test/report/locale/en-US.ts |  4 ++++
 .../src/views/api-test/report/locale/zh-CN.ts |  3 +++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/result/ProcessResultDTO.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/result/ProcessResultDTO.java
index 068a61e5a5..455c6d82eb 100644
--- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/result/ProcessResultDTO.java
+++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/result/ProcessResultDTO.java
@@ -29,6 +29,9 @@ public class ProcessResultDTO {
     // 请求总时长
     private long requestDuration;
 
+    // 标记执行步骤中是否有脚本报错，记录最后一次错误信息
+    private String lastScriptIdentifier;
+
     public void computerTotal() {
         this.total = this.pendingCount + this.errorCount + this.successCount;
     }
diff --git a/frontend/src/views/api-test/report/component/reportList.vue b/frontend/src/views/api-test/report/component/reportList.vue
index c4c0fec4e5..b67101fafe 100644
--- a/frontend/src/views/api-test/report/component/reportList.vue
+++ b/frontend/src/views/api-test/report/component/reportList.vue
@@ -62,7 +62,7 @@
         </a-trigger>
       </template>
       <!-- 报告结果筛选 -->
-      <template #statusFilter="{ columnConfig }">
+      <template #statusFilter="{ record, columnConfig }">
         <a-trigger
           v-model:popup-visible="statusFilterVisible"
           trigger="click"
@@ -79,7 +79,11 @@
               <div class="flex items-center justify-center px-[6px] py-[2px]">
                 <a-checkbox-group v-model:model-value="statusListFilters" direction="vertical" size="small">
                   <a-checkbox v-for="key of statusFilters" :key="key" :value="key">
-                    <ExecutionStatus :module-type="props.moduleType" :status="key" />
+                    <ExecutionStatus
+                      :module-type="props.moduleType"
+                      :status="key"
+                      :script-identifier="record.scriptIdentifier"
+                    />
                   </a-checkbox>
                 </a-checkbox-group>
               </div>
@@ -192,7 +196,7 @@
       slotName: 'status',
       titleSlotName: 'statusFilter',
       showInTable: true,
-      width: 150,
+      width: 200,
       showDrag: true,
     },
     {
diff --git a/frontend/src/views/api-test/report/component/reportStatus.vue b/frontend/src/views/api-test/report/component/reportStatus.vue
index e1365f7f6c..5908cf3f62 100644
--- a/frontend/src/views/api-test/report/component/reportStatus.vue
+++ b/frontend/src/views/api-test/report/component/reportStatus.vue
@@ -2,12 +2,26 @@
   <div class="flex items-center justify-start">
     <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
+        class="ml-2"
+        :self-style="{
+          border: `1px solid ${methodColor}`,
+          color: methodColor,
+          backgroundColor: 'white',
+        }"
+      >
+        {{ t('report.detail.script.error') }}
+      </MsTag>
+    </a-tooltip>
   </div>
 </template>
 
 <script setup lang="ts">
   import { ref } from 'vue';
 
+  import MsTag from '@/components/pure/ms-tag/ms-tag.vue';
+
   import { useI18n } from '@/hooks/useI18n';
 
   import { ReportEnum } from '@/enums/reportEnum';
@@ -15,6 +29,7 @@
   const { t } = useI18n();
   const props = defineProps<{
     status: string;
+    scriptIdentifier?: string;
     moduleType: keyof typeof ReportEnum;
   }>();
 
@@ -98,6 +113,14 @@
   function getExecutionResult(): IconType {
     return iconTypeStatus.value[props.moduleType][props.status];
   }
+  const methodColor = 'rgb(var(--warning-7))';
+
+  function getMsg() {
+    if (props.moduleType === ReportEnum.API_SCENARIO_REPORT && props.scriptIdentifier) {
+      return t('report.detail.scenario.errorTip');
+    }
+    return t('report.detail.api.errorTip');
+  }
 </script>
 
 <style scoped></style>
diff --git a/frontend/src/views/api-test/report/locale/en-US.ts b/frontend/src/views/api-test/report/locale/en-US.ts
index 7fd4d7a7f9..64f70c4604 100644
--- a/frontend/src/views/api-test/report/locale/en-US.ts
+++ b/frontend/src/views/api-test/report/locale/en-US.ts
@@ -28,4 +28,8 @@ export default {
   'report.detail.fakeErrorCount': 'False alarm',
   'report.detail.pendingCount': 'Not executed',
   'report.detail.stepTotal': 'total',
+  'report.detail.script.error': 'Script error',
+  'report.detail.scenario.errorTip':
+    'There is a pre/post script running error in the execution step of the current scenario.',
+  'report.detail.api.errorTip': 'There are pre/post script running errors in the current use case execution.',
 };
diff --git a/frontend/src/views/api-test/report/locale/zh-CN.ts b/frontend/src/views/api-test/report/locale/zh-CN.ts
index 830df55be2..cb3206f080 100644
--- a/frontend/src/views/api-test/report/locale/zh-CN.ts
+++ b/frontend/src/views/api-test/report/locale/zh-CN.ts
@@ -28,4 +28,7 @@ export default {
   'report.detail.fakeErrorCount': '误报',
   'report.detail.pendingCount': '未执行',
   'report.detail.stepTotal': '总数',
+  'report.detail.script.error': '脚本失败',
+  'report.detail.scenario.errorTip': '当前场景的执行步骤中存在 前/后置脚本运行错误',
+  'report.detail.api.errorTip': '当前用例执行存在 前/后置脚本运行错误',
 };