fix(测试计划): 测试计划报告增加停止状态

测试计划报告增加停止状态

backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java

@@ -605,7 +605,7 @@ public class TestPlanReportService {
     public void delete(QueryTestPlanReportRequest request) {
         List<String> deleteReportIds = request.getDataIds();
         if (request.isSelectAllDate()) {
-            deleteReportIds = this.getAllApiIdsByFontedSelect(request.getFilters(), request.getName(), request.getProjectId(), request.getUnSelectIds(), request.getCombine());
+            deleteReportIds = this.getAllApiIdsByFrontedSelect(request.getFilters(), request.getName(), request.getProjectId(), request.getUnSelectIds(), request.getCombine());
         }
         if (CollectionUtils.isNotEmpty(deleteReportIds)) {
             TestPlanReportExample deleteReportExample = new TestPlanReportExample();
@@ -623,7 +623,7 @@ public class TestPlanReportService {
         }
     }
 
-    private List<String> getAllApiIdsByFontedSelect(Map<String, List<String>> filters, String name, String projectId, List<String> unSelectIds, Map<String, Object> combine) {
+    private List<String> getAllApiIdsByFrontedSelect(Map<String, List<String>> filters, String name, String projectId, List<String> unSelectIds, Map<String, Object> combine) {
         QueryTestPlanReportRequest request = new QueryTestPlanReportRequest();
         request.setFilters(filters);
         request.setName(name);

frontend/src/business/components/track/common/tableItems/planview/StatusTableItem.vue

@@ -3,7 +3,9 @@
       <ms-tag v-if="value == 'Prepare'" type="info" :content="$t('test_track.plan.plan_status_prepare')"/>
       <ms-tag v-if="value == 'Underway'" type="primary" :content="$t('test_track.plan.plan_status_running')"/>
       <ms-tag v-if="value == 'Pass'" type="success" :content="$t('test_track.plan_view.pass')"/>
-      <ms-tag v-if="value == 'UnPass'" type="danger" content="$t('test_track.plan_view.not_pass')"/>
+      <ms-tag v-if="value == 'UnPass'" type="danger" :content="$t('test_track.plan_view.not_pass')"/>
+      <ms-tag v-if="value == 'STOP'" type="info" :content="$t('test_track.plan_view.stop')"/>
+      <ms-tag v-if="value == 'stop'" type="info" :content="$t('test_track.plan_view.stop')"/>
       <ms-tag v-if="value == 'Failure'" type="danger" :content="$t('test_track.plan_view.failure')"/>
       <ms-tag v-if="value == 'Blocking'" type="warning" :content="$t('test_track.plan_view.blocking')"/>
       <ms-tag v-if="value == 'Skip'" type="info" :content="$t('test_track.plan_view.skip')"/>

frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue

@@ -42,8 +42,9 @@
                 prop="lastResult">
                 <template v-slot:default="scope">
                   <status-table-item v-if="scope.row.execResult === 'success'" :value="'Pass'"/>
-                  <status-table-item v-if="scope.row.execResult === 'error'" :value="'Failure'"/>
+                  <status-table-item v-else-if="scope.row.execResult === 'error'" :value="'Failure'"/>
-                  <status-table-item v-if="scope.row.execResult != 'error' && scope.row.execResult != 'success'" :value="'Prepare'"/>
+                  <status-table-item v-else-if="scope.row.execResult === 'STOP'" :value="'STOP'"/>
+                  <status-table-item v-else :value="'Prepare'"/>
                 </template>
               </ms-table-column>
             </ms-table>

frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue

@@ -42,8 +42,9 @@
                 prop="lastResult">
                 <template v-slot:default="{row}">
                   <status-table-item v-if="row.lastResult === 'Success'" :value="'Pass'"/>
-                  <status-table-item v-if="row.lastResult === 'Fail'" :value="'Failure'"/>
+                  <status-table-item v-else-if="row.lastResult === 'Fail'" :value="'Failure'"/>
-                  <status-table-item v-if="row.lastResult != 'Fail' && row.lastResult != 'Success'" :value="'Prepare'"/>
+                  <status-table-item v-else-if="row.lastResult === 'STOP'" :value="'STOP'"/>
+                  <status-table-item v-else :value="'Prepare'"/>
                 </template>
               </ms-table-column>
             </ms-table>

frontend/src/i18n/en-US.js

@@ -2153,6 +2153,7 @@ export default {
       not_pass: "UnPass",
       failure: "Failure",
       blocking: "Blocking",
+      stop: "Stop",
       skip: "Skip",
       actual_result: "Actual result",
       step_result: "Step result",

frontend/src/i18n/zh-CN.js

@@ -2157,6 +2157,7 @@ export default {
       not_pass: "不通过",
       failure: "失败",
       blocking: "阻塞",
+      stop: "停止",
       skip: "跳过",
       actual_result: "实际结果",
       step_result: "步骤执行结果",

frontend/src/i18n/zh-TW.js

@@ -2157,6 +2157,7 @@ export default {
       not_pass: "不通過",
       failure: "失敗",
       blocking: "阻塞",
+      stop: "停止",
       skip: "跳過",
       actual_result: "實際結果",
       step_result: "步驟執行結果",