feat_用例状态增加筛选 --story=1003529 --user=王孝刚 3.用例状态增加筛选 https://www.tapd.cn/55049933/s/1056379

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml

@@ -323,9 +323,6 @@
                         </when>
                     </choose>
                 </if>
-                <if test="key=='status' and values.size == 0">
-                    and (test_case.status is null or test_case.status != 'Trash')
-                </if>
             </foreach>
         </if>
         <if test="request.filters == null || request.filters.size() == 0 ">

frontend/src/business/components/track/case/components/TestCaseList.vue

@@ -146,6 +146,15 @@
           </template>
         </ms-table-column >
 
+         <ms-table-column
+           prop="status"
+           :filters="statusFilters"
+           :field="item"
+           :fields-width="fieldsWidth"
+           min-width="100px"
+           :label="$t('api_test.definition.api_case_status')">
+        </ms-table-column>
+
         <ms-table-column v-for="field in testCaseTemplate.customFields" :key="field.id"
                          :filters="field.name === '用例等级' ? priorityFilters : null"
                          :field="item"
@@ -204,6 +213,7 @@ import StatusTableItem from "@/business/components/track/common/tableItems/planv
 import TestCaseDetail from "./TestCaseDetail";
 import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
 import MsTag from "@/business/components/common/components/MsTag";
+import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus.vue";
 import {
   buildBatchParam,
   deepClone,
@@ -255,7 +265,7 @@ export default {
     StatusTableItem,
     TestCaseDetail,
     ReviewStatus,
-    MsTag,
+    MsTag,ApiStatus
   },
   data() {
     return {
@@ -402,6 +412,7 @@ export default {
       this.condition.filters = {status: ["Trash"]};
     }else {
       this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
+      this.condition.filters = {status: ["Prepare" , "Underway" , "Completed"]}
     }
     this.initTableData();
     let redirectParam = this.$route.query.dataSelectRange;
@@ -429,6 +440,7 @@ export default {
   activated() {
     this.getTemplateField();
     this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
+    this.condition.filters = {status: ["Prepare" , "Underway" , "Completed"]}
     let ids = this.$route.params.ids;
     if (ids) {
       this.condition.ids = ids;
@@ -440,7 +452,7 @@ export default {
     selectNodeIds() {
       this.page.currentPage = 1;
       if(!this.trashEnable){
-        this.condition.filters.status = [];
+        this.condition.filters.status = ["Prepare" , "Underway" , "Completed"];
       }
       initCondition(this.condition, false);
       this.initTableData();
@@ -549,7 +561,9 @@ export default {
           this.condition.nodeIds = this.selectNodeIds;
         }
       }
-
+      if(this.condition.filters.status===null) {
+        this.condition.filters.status = ["Prepare", "Underway", "Completed"];
+      }
       this.getData();
     },
     getData() {

frontend/src/common/js/default-table-header.js

@@ -180,6 +180,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'createUser', key: '7', label: 'commons.create_user'},
     {id: 'createTime', key: '8', label: 'commons.create_time'},
     {id: 'desc', key: '9', label: 'test_track.case.case_desc'},
+    {id: 'status', key: '10', label: 'api_test.definition.api_case_status'},
   ],
   //缺陷列表
   ISSUE_LIST: [