From e43777b4fa7fa367f9cbe18d6a7400df1e891ca3 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 21 Oct 2021 13:30:51 +0800
Subject: [PATCH] =?UTF-8?q?feat=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E7=94=A8=E4=BE=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiTestCaseService.java       | 45 +++++++-----
 .../metersphere/base/domain/ApiTestCase.java  |  7 +-
 .../base/domain/ApiTestCaseExample.java       | 72 ++++++++++++++++++-
 .../base/mapper/ApiTestCaseMapper.xml         | 63 ++++++++++------
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  8 ++-
 .../db/migration/V97__v1.14_release.sql       |  5 +-
 .../components/case/ApiCaseItem.vue           | 53 +++++++-------
 .../components/list/ApiCaseSimpleList.vue     | 19 +++++
 .../api/definition/model/JsonData.js          |  2 +-
 .../src/common/js/default-table-header.js     |  3 +-
 10 files changed, 204 insertions(+), 73 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index 2404211d5e..5c2472c1fa 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -328,25 +328,30 @@ public class ApiTestCaseService {
             request = esbApiParamService.handleEsbRequest(request);
         }
 
-        final ApiTestCaseWithBLOBs test = new ApiTestCaseWithBLOBs();
-        test.setId(request.getId());
-        test.setName(request.getName());
-        test.setApiDefinitionId(request.getApiDefinitionId());
-        test.setUpdateUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
-        test.setProjectId(request.getProjectId());
-        test.setRequest(JSONObject.toJSONString(request.getRequest()));
-        test.setPriority(request.getPriority());
-        test.setUpdateTime(System.currentTimeMillis());
-        test.setDescription(request.getDescription());
-        test.setVersion(request.getVersion() == null ? 0 : request.getVersion() + 1);
-        test.setFollowPeople(request.getFollowPeople());
-        if (StringUtils.equals("[]", request.getTags())) {
-            test.setTags("");
-        } else {
-            test.setTags(request.getTags());
+        final ApiTestCaseWithBLOBs test = apiTestCaseMapper.selectByPrimaryKey(request.getId());
+        if (test != null) {
+            test.setName(request.getName());
+            test.setCaseStatus(request.getCaseStatus());
+            if (StringUtils.isEmpty(request.getCaseStatus())) {
+                test.setCaseStatus(APITestStatus.Underway.name());
+            }
+            test.setApiDefinitionId(request.getApiDefinitionId());
+            test.setUpdateUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
+            test.setProjectId(request.getProjectId());
+            test.setRequest(JSONObject.toJSONString(request.getRequest()));
+            test.setPriority(request.getPriority());
+            test.setUpdateTime(System.currentTimeMillis());
+            test.setDescription(request.getDescription());
+            test.setVersion(request.getVersion() == null ? 0 : request.getVersion() + 1);
+            test.setFollowPeople(request.getFollowPeople());
+            if (StringUtils.equals("[]", request.getTags())) {
+                test.setTags("");
+            } else {
+                test.setTags(request.getTags());
+            }
+            apiTestCaseMapper.updateByPrimaryKeySelective(test);
         }
-        apiTestCaseMapper.updateByPrimaryKeySelective(test);
-        return apiTestCaseMapper.selectByPrimaryKey(request.getId());
+        return test;
     }
 
     private ApiTestCase createTest(SaveApiTestCaseRequest request, List<MultipartFile> bodyFiles) {
@@ -362,6 +367,10 @@ public class ApiTestCaseService {
         test.setId(request.getId());
         test.setName(request.getName());
         test.setStatus("");
+        test.setCaseStatus(request.getCaseStatus());
+        if (StringUtils.isEmpty(request.getCaseStatus())) {
+            test.setCaseStatus(APITestStatus.Underway.name());
+        }
         test.setApiDefinitionId(request.getApiDefinitionId());
         test.setCreateUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
         test.setUpdateUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiTestCase.java b/backend/src/main/java/io/metersphere/base/domain/ApiTestCase.java
index 716c47c712..f7082b03dd 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiTestCase.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiTestCase.java
@@ -1,8 +1,9 @@
 package io.metersphere.base.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class ApiTestCase implements Serializable {
     private String id;
@@ -43,5 +44,7 @@ public class ApiTestCase implements Serializable {
 
     private Long order;
 
+    private String caseStatus;
+
     private static final long serialVersionUID = 1L;
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiTestCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiTestCaseExample.java
index c42e6e9912..e778d2afb2 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiTestCaseExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiTestCaseExample.java
@@ -1373,6 +1373,76 @@ public class ApiTestCaseExample {
             addCriterion("`order` not between", value1, value2, "order");
             return (Criteria) this;
         }
+
+        public Criteria andCaseStatusIsNull() {
+            addCriterion("case_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusIsNotNull() {
+            addCriterion("case_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusEqualTo(String value) {
+            addCriterion("case_status =", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusNotEqualTo(String value) {
+            addCriterion("case_status <>", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusGreaterThan(String value) {
+            addCriterion("case_status >", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("case_status >=", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusLessThan(String value) {
+            addCriterion("case_status <", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusLessThanOrEqualTo(String value) {
+            addCriterion("case_status <=", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusLike(String value) {
+            addCriterion("case_status like", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusNotLike(String value) {
+            addCriterion("case_status not like", value, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusIn(List<String> values) {
+            addCriterion("case_status in", values, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusNotIn(List<String> values) {
+            addCriterion("case_status not in", values, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusBetween(String value1, String value2) {
+            addCriterion("case_status between", value1, value2, "caseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseStatusNotBetween(String value1, String value2) {
+            addCriterion("case_status not between", value1, value2, "caseStatus");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
@@ -1467,4 +1537,4 @@ public class ApiTestCaseExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiTestCaseMapper.xml
index 1ca34f16dc..6743ee7295 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiTestCaseMapper.xml
@@ -21,6 +21,7 @@
     <result column="version" jdbcType="INTEGER" property="version" />
     <result column="follow_people" jdbcType="VARCHAR" property="followPeople" />
     <result column="order" jdbcType="BIGINT" property="order" />
+    <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -85,9 +86,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, project_id, `name`, priority, api_definition_id, create_user_id, update_user_id,
-    create_time, update_time, num, tags, last_result_id, `status`, original_status, delete_time,
-    delete_user_id, version, follow_people, `order`
+    id, project_id, `name`, priority, api_definition_id, create_user_id, update_user_id, 
+    create_time, update_time, num, tags, last_result_id, `status`, original_status, delete_time, 
+    delete_user_id, version, follow_people, `order`, case_status
   </sql>
   <sql id="Blob_Column_List">
     description, request
@@ -123,7 +124,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
+    select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -141,22 +142,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
-    insert into api_test_case (id, project_id, `name`,
-      priority, api_definition_id, create_user_id,
-      update_user_id, create_time, update_time,
-      num, tags, last_result_id,
-      `status`, original_status, delete_time,
-      delete_user_id, version, follow_people,
-      `order`, description, request
-      )
-    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-      #{priority,jdbcType=VARCHAR}, #{apiDefinitionId,jdbcType=VARCHAR}, #{createUserId,jdbcType=VARCHAR},
-      #{updateUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
-      #{num,jdbcType=INTEGER}, #{tags,jdbcType=VARCHAR}, #{lastResultId,jdbcType=VARCHAR},
-      #{status,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT},
-      #{deleteUserId,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{followPeople,jdbcType=VARCHAR},
-      #{order,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR}, #{request,jdbcType=LONGVARCHAR}
-      )
+    insert into api_test_case (id, project_id, `name`, 
+      priority, api_definition_id, create_user_id, 
+      update_user_id, create_time, update_time, 
+      num, tags, last_result_id, 
+      `status`, original_status, delete_time, 
+      delete_user_id, version, follow_people, 
+      `order`, case_status, description, 
+      request)
+    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{priority,jdbcType=VARCHAR}, #{apiDefinitionId,jdbcType=VARCHAR}, #{createUserId,jdbcType=VARCHAR}, 
+      #{updateUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
+      #{num,jdbcType=INTEGER}, #{tags,jdbcType=VARCHAR}, #{lastResultId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, 
+      #{deleteUserId,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{followPeople,jdbcType=VARCHAR}, 
+      #{order,jdbcType=BIGINT}, #{caseStatus,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, 
+      #{request,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
     insert into api_test_case
@@ -218,6 +219,9 @@
       <if test="order != null">
         `order`,
       </if>
+      <if test="caseStatus != null">
+        case_status,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -283,6 +287,9 @@
       <if test="order != null">
         #{order,jdbcType=BIGINT},
       </if>
+      <if test="caseStatus != null">
+        #{caseStatus,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -357,6 +364,9 @@
       <if test="record.order != null">
         `order` = #{record.order,jdbcType=BIGINT},
       </if>
+      <if test="record.caseStatus != null">
+        case_status = #{record.caseStatus,jdbcType=VARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -389,6 +399,7 @@
       version = #{record.version,jdbcType=INTEGER},
       follow_people = #{record.followPeople,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
+      case_status = #{record.caseStatus,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR},
       request = #{record.request,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -415,7 +426,8 @@
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
       version = #{record.version,jdbcType=INTEGER},
       follow_people = #{record.followPeople,jdbcType=VARCHAR},
-      `order` = #{record.order,jdbcType=BIGINT}
+      `order` = #{record.order,jdbcType=BIGINT},
+      case_status = #{record.caseStatus,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -477,6 +489,9 @@
       <if test="order != null">
         `order` = #{order,jdbcType=BIGINT},
       </if>
+      <if test="caseStatus != null">
+        case_status = #{caseStatus,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -506,6 +521,7 @@
       version = #{version,jdbcType=INTEGER},
       follow_people = #{followPeople,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
+      case_status = #{caseStatus,jdbcType=VARCHAR},
       description = #{description,jdbcType=LONGVARCHAR},
       request = #{request,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -529,7 +545,8 @@
       delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
       version = #{version,jdbcType=INTEGER},
       follow_people = #{followPeople,jdbcType=VARCHAR},
-      `order` = #{order,jdbcType=BIGINT}
+      `order` = #{order,jdbcType=BIGINT},
+      case_status = #{caseStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 80f278a383..40d9c56fd1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -242,7 +242,7 @@
 
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
         select
-        t1.id, t1.project_id, t1.name, t1.api_definition_id, t1.priority, t1.description, t1.create_user_id, t1.update_user_id, t1.create_time, t1.update_time, t1.num,
+        t1.id, t1.project_id, t1.name,t1.case_status, t1.api_definition_id, t1.priority, t1.description, t1.create_user_id, t1.update_user_id, t1.create_time, t1.update_time, t1.num,
         a.module_id, a.path, a.protocol, t1.tags,t1.status,t1.last_result_id as lastResultId,
         t1.delete_time, deleteUser.name AS deleteUser,CONCAT(FORMAT(SUM(IF (t2.`status`='success',1,0))/COUNT(t2.id)*100,2),'%') passRate
         from
@@ -311,6 +311,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='caseStatus' or key=='case_status'">
+                            and t1.case_status in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
                     </choose>
                 </if>
                 <if test="key=='status' and values.size == 0">
diff --git a/backend/src/main/resources/db/migration/V97__v1.14_release.sql b/backend/src/main/resources/db/migration/V97__v1.14_release.sql
index a14878c56b..7fb2a81653 100644
--- a/backend/src/main/resources/db/migration/V97__v1.14_release.sql
+++ b/backend/src/main/resources/db/migration/V97__v1.14_release.sql
@@ -334,4 +334,7 @@ ALTER TABLE service_integration
     DROP COLUMN organization_id;
 
 ALTER TABLE workspace
-    DROP COLUMN organization_id;
\ No newline at end of file
+    DROP COLUMN organization_id;
+
+ALTER TABLE api_test_case ADD COLUMN case_status VARCHAR(100) comment '用例状态等同场景的status';
+UPDATE api_test_case set case_status ="Underway" where case_status is null;
\ No newline at end of file
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index de4714ff10..d0ffc48b87 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -37,10 +37,6 @@
             <el-link type="primary" style="margin-left: 10px" @click="openHis(apiCase)" v-if="apiCase.id">{{ $t('operating_log.change_history') }}</el-link>
           </span>
           <div v-if="apiCase.id" style="color: #999999;font-size: 12px">
-            <!--<span>-->
-            <!--{{ apiCase.createTime | timestampFormatDate }}-->
-            <!--{{ apiCase.createUser }} {{ $t('api_test.definition.request.create_info') }}-->
-            <!--</span>-->
             <span style="margin-left: 10px">
               {{ apiCase.updateTime | timestampFormatDate }}
               {{ apiCase.updateUser }} {{ $t('api_test.definition.request.update_info') }}
@@ -58,26 +54,32 @@
             </el-tooltip>
          </span>
         </el-col>
-        <el-col :span="3">
-          <div class="tag-item" @click.stop>
-            <ms-input-tag :currentScenario="apiCase" ref="tag" @keyup.enter.native="saveTestCase(apiCase,true)"/>
-          </div>
-        </el-col>
-
-        <el-col :span="3">
-          <div class="tag-item" @click.stop>
-            <el-select v-model="apiCase.followPeople"
-                       clearable
-                       :placeholder="$t('api_test.automation.follow_people')" filterable size="small"
-                       @change="saveTestCase(apiCase,true)">
-              <el-option
-                v-for="item in maintainerOptions"
-                :key="item.id"
-                :label="item.id + ' (' + item.name + ')'"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
+        <el-col :span="6">
+          <el-row>
+            <el-col :span="8">
+              <el-select size="small" v-model="apiCase.caseStatus" style="margin-right: 5px" @change="saveTestCase(apiCase,true)">
+                <el-option v-for="item in options" :key="item.id" :label="$t(item.label)" :value="item.id"/>
+              </el-select>
+            </el-col>
+            <el-col :span="16">
+              <div class="tag-item" @click.stop>
+                <el-select v-model="apiCase.followPeople" clearable :placeholder="$t('api_test.automation.follow_people')" filterable size="small"
+                           @change="saveTestCase(apiCase,true)" style="width: 100%">
+                  <el-option
+                    v-for="item in maintainerOptions"
+                    :key="item.id"
+                    :label="item.id + ' (' + item.name + ')'"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top: 5px">
+            <div class="tag-item" @click.stop>
+              <ms-input-tag :currentScenario="apiCase" ref="tag" @keyup.enter.native="saveTestCase(apiCase,true)"/>
+            </div>
+          </el-row>
         </el-col>
 
         <el-col :span="3">
@@ -156,7 +158,7 @@
 
 <script>
 import {_getBodyUploadFiles, getCurrentProjectID, getUUID} from "@/common/js/utils";
-import {PRIORITY} from "../../model/JsonData";
+import {API_STATUS, PRIORITY} from "../../model/JsonData";
 import MsTag from "../../../../common/components/MsTag";
 import MsTipButton from "../../../../common/components/MsTipButton";
 import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
@@ -214,6 +216,7 @@ export default {
   },
   data() {
     return {
+      options: API_STATUS,
       result: {},
       grades: [],
       resultMap: new Map([
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index c62643257f..8ce2bc20d6 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -87,6 +87,18 @@
             </template>
           </ms-table-column>
 
+          <ms-table-column
+            prop="caseStatus"
+            :filters="STATUS_FILTERS"
+            :field="item"
+            :fields-width="fieldsWidth"
+            min-width="120px"
+            :label="$t('commons.status')">
+            <template v-slot:default="scope">
+              <plan-status-table-item :value="scope.row.caseStatus"/>
+            </template>
+          </ms-table-column>
+
           <ms-table-column
             prop="status"
             :filters="statusFilters"
@@ -238,6 +250,7 @@ import ApiCaseBatchRun from "@/business/components/api/definition/components/lis
 import MsRequestResultTail from "../../../../api/definition/components/response/RequestResultTail";
 import {editApiTestCaseOrder} from "@/network/api";
 import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
+import i18n from "@/i18n/i18n";
 
 export default {
   name: "ApiCaseSimpleList",
@@ -263,6 +276,7 @@ export default {
     MsTable,
     MsTableColumn,
     MsRequestResultTail,
+    PlanStatusTableItem: () => import("../../../../track/common/tableItems/plan/PlanStatusTableItem"),
     MsTaskCenter: () => import("../../../../task/TaskCenter"),
   },
   data() {
@@ -339,6 +353,11 @@ export default {
         {text: 'P2', value: 'P2'},
         {text: 'P3', value: 'P3'}
       ],
+      STATUS_FILTERS: [
+        {text: i18n.t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
+        {text: i18n.t('test_track.plan.plan_status_running'), value: 'Underway'},
+        {text: i18n.t('test_track.plan.plan_status_completed'), value: 'Completed'}
+      ],
       statusFilters: [
         {text: this.$t('api_test.automation.success'), value: 'success'},
         {text: this.$t('api_test.automation.fail'), value: 'error'},
diff --git a/frontend/src/business/components/api/definition/model/JsonData.js b/frontend/src/business/components/api/definition/model/JsonData.js
index fbbba01685..436eb29bc1 100644
--- a/frontend/src/business/components/api/definition/model/JsonData.js
+++ b/frontend/src/business/components/api/definition/model/JsonData.js
@@ -89,7 +89,7 @@ export const REVIEW_STATUS = [
 export const API_STATUS = [
   {id: 'Prepare', label: 'test_track.plan.plan_status_prepare'},
   {id: 'Underway', label: 'test_track.plan.plan_status_running'},
-  {id: 'Completed', label: 'test_track.plan.plan_status_finished'}
+  {id: 'Completed', label: 'test_track.plan.plan_status_completed'}
 ];
 export const TEST = [
   {id: 'performance', name: '性能测试', module: 'performance'},
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index db2fde6792..6abb5cf1bd 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -54,11 +54,12 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'priority', key: '3', label: 'test_track.case.priority'},
     {id: 'path', key: '4', label: 'api_test.definition.api_definition_path'},
     {id: 'status', key: '5', label: 'test_track.plan_view.execute_result'},
-    {id: 'passRate', key: '6', label: 'commons.pass_rate'},
+    {id: 'caseStatus', key: '6', label: 'commons.status'},
     {id: 'tags', key: '7', label: 'commons.tag'},
     {id: 'createUser', key: '8', label: 'api_test.creator'},
     {id: 'updateTime', key: '9', label: 'api_test.definition.api_last_time'},
     {id: 'createTime', key: 'a', label: 'commons.create_time'},
+    {id: 'passRate', key: 'b', label: 'commons.pass_rate'},
   ],
   //场景测试
   API_SCENARIO: [