feat: 测试跟踪版本管理初步提交

backend/src/main/java/io/metersphere/base/domain/TestCase.java

@@ -9,6 +9,8 @@ public class TestCase implements Serializable {
 
     private String nodeId;
 
+    private String testId;
+
     private String nodePath;
 
     private String projectId;
@@ -27,8 +29,6 @@ public class TestCase implements Serializable {
 
     private Long updateTime;
 
-    private String testId;
-
     private Integer sort;
 
     private Integer num;
@@ -45,10 +45,10 @@ public class TestCase implements Serializable {
 
     private String status;
 
-    private String customNum;
-
     private String stepModel;
 
+    private String customNum;
+
     private String createUser;
 
     private String originalStatus;
@@ -61,5 +61,9 @@ public class TestCase implements Serializable {
 
     private Boolean casePublic;
 
+    private String versionId;
+
+    private String refId;
+
     private static final long serialVersionUID = 1L;
 }

backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java

@@ -244,6 +244,76 @@ public class TestCaseExample {
             return (Criteria) this;
         }
 
+        public Criteria andTestIdIsNull() {
+            addCriterion("test_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIsNotNull() {
+            addCriterion("test_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdEqualTo(String value) {
+            addCriterion("test_id =", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotEqualTo(String value) {
+            addCriterion("test_id <>", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdGreaterThan(String value) {
+            addCriterion("test_id >", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdGreaterThanOrEqualTo(String value) {
+            addCriterion("test_id >=", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLessThan(String value) {
+            addCriterion("test_id <", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLessThanOrEqualTo(String value) {
+            addCriterion("test_id <=", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLike(String value) {
+            addCriterion("test_id like", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotLike(String value) {
+            addCriterion("test_id not like", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIn(List<String> values) {
+            addCriterion("test_id in", values, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotIn(List<String> values) {
+            addCriterion("test_id not in", values, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdBetween(String value1, String value2) {
+            addCriterion("test_id between", value1, value2, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotBetween(String value1, String value2) {
+            addCriterion("test_id not between", value1, value2, "testId");
+            return (Criteria) this;
+        }
+
         public Criteria andNodePathIsNull() {
             addCriterion("node_path is null");
             return (Criteria) this;
@@ -854,76 +924,6 @@ public class TestCaseExample {
             return (Criteria) this;
         }
 
-        public Criteria andTestIdIsNull() {
-            addCriterion("test_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdIsNotNull() {
-            addCriterion("test_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdEqualTo(String value) {
-            addCriterion("test_id =", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotEqualTo(String value) {
-            addCriterion("test_id <>", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdGreaterThan(String value) {
-            addCriterion("test_id >", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdGreaterThanOrEqualTo(String value) {
-            addCriterion("test_id >=", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdLessThan(String value) {
-            addCriterion("test_id <", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdLessThanOrEqualTo(String value) {
-            addCriterion("test_id <=", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdLike(String value) {
-            addCriterion("test_id like", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotLike(String value) {
-            addCriterion("test_id not like", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdIn(List<String> values) {
-            addCriterion("test_id in", values, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotIn(List<String> values) {
-            addCriterion("test_id not in", values, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdBetween(String value1, String value2) {
-            addCriterion("test_id between", value1, value2, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotBetween(String value1, String value2) {
-            addCriterion("test_id not between", value1, value2, "testId");
-            return (Criteria) this;
-        }
-
         public Criteria andSortIsNull() {
             addCriterion("sort is null");
             return (Criteria) this;
@@ -1464,76 +1464,6 @@ public class TestCaseExample {
             return (Criteria) this;
         }
 
-        public Criteria andCustomNumIsNull() {
-            addCriterion("custom_num is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumIsNotNull() {
-            addCriterion("custom_num is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumEqualTo(String value) {
-            addCriterion("custom_num =", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumNotEqualTo(String value) {
-            addCriterion("custom_num <>", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumGreaterThan(String value) {
-            addCriterion("custom_num >", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumGreaterThanOrEqualTo(String value) {
-            addCriterion("custom_num >=", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumLessThan(String value) {
-            addCriterion("custom_num <", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumLessThanOrEqualTo(String value) {
-            addCriterion("custom_num <=", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumLike(String value) {
-            addCriterion("custom_num like", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumNotLike(String value) {
-            addCriterion("custom_num not like", value, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumIn(List<String> values) {
-            addCriterion("custom_num in", values, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumNotIn(List<String> values) {
-            addCriterion("custom_num not in", values, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumBetween(String value1, String value2) {
-            addCriterion("custom_num between", value1, value2, "customNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andCustomNumNotBetween(String value1, String value2) {
-            addCriterion("custom_num not between", value1, value2, "customNum");
-            return (Criteria) this;
-        }
-
         public Criteria andStepModelIsNull() {
             addCriterion("step_model is null");
             return (Criteria) this;
@@ -1604,6 +1534,76 @@ public class TestCaseExample {
             return (Criteria) this;
         }
 
+        public Criteria andCustomNumIsNull() {
+            addCriterion("custom_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumIsNotNull() {
+            addCriterion("custom_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumEqualTo(String value) {
+            addCriterion("custom_num =", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumNotEqualTo(String value) {
+            addCriterion("custom_num <>", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumGreaterThan(String value) {
+            addCriterion("custom_num >", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumGreaterThanOrEqualTo(String value) {
+            addCriterion("custom_num >=", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumLessThan(String value) {
+            addCriterion("custom_num <", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumLessThanOrEqualTo(String value) {
+            addCriterion("custom_num <=", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumLike(String value) {
+            addCriterion("custom_num like", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumNotLike(String value) {
+            addCriterion("custom_num not like", value, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumIn(List<String> values) {
+            addCriterion("custom_num in", values, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumNotIn(List<String> values) {
+            addCriterion("custom_num not in", values, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumBetween(String value1, String value2) {
+            addCriterion("custom_num between", value1, value2, "customNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomNumNotBetween(String value1, String value2) {
+            addCriterion("custom_num not between", value1, value2, "customNum");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIsNull() {
             addCriterion("create_user is null");
             return (Criteria) this;
@@ -1993,6 +1993,146 @@ public class TestCaseExample {
             addCriterion("case_public not between", value1, value2, "casePublic");
             return (Criteria) this;
         }
+
+        public Criteria andVersionIdIsNull() {
+            addCriterion("version_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdIsNotNull() {
+            addCriterion("version_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdEqualTo(String value) {
+            addCriterion("version_id =", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdNotEqualTo(String value) {
+            addCriterion("version_id <>", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdGreaterThan(String value) {
+            addCriterion("version_id >", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdGreaterThanOrEqualTo(String value) {
+            addCriterion("version_id >=", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdLessThan(String value) {
+            addCriterion("version_id <", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdLessThanOrEqualTo(String value) {
+            addCriterion("version_id <=", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdLike(String value) {
+            addCriterion("version_id like", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdNotLike(String value) {
+            addCriterion("version_id not like", value, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdIn(List<String> values) {
+            addCriterion("version_id in", values, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdNotIn(List<String> values) {
+            addCriterion("version_id not in", values, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdBetween(String value1, String value2) {
+            addCriterion("version_id between", value1, value2, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIdNotBetween(String value1, String value2) {
+            addCriterion("version_id not between", value1, value2, "versionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdIsNull() {
+            addCriterion("ref_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdIsNotNull() {
+            addCriterion("ref_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdEqualTo(String value) {
+            addCriterion("ref_id =", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdNotEqualTo(String value) {
+            addCriterion("ref_id <>", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdGreaterThan(String value) {
+            addCriterion("ref_id >", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ref_id >=", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdLessThan(String value) {
+            addCriterion("ref_id <", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdLessThanOrEqualTo(String value) {
+            addCriterion("ref_id <=", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdLike(String value) {
+            addCriterion("ref_id like", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdNotLike(String value) {
+            addCriterion("ref_id not like", value, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdIn(List<String> values) {
+            addCriterion("ref_id in", values, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdNotIn(List<String> values) {
+            addCriterion("ref_id not in", values, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdBetween(String value1, String value2) {
+            addCriterion("ref_id between", value1, value2, "refId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefIdNotBetween(String value1, String value2) {
+            addCriterion("ref_id not between", value1, value2, "refId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.TestCase">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="node_id" jdbcType="VARCHAR" property="nodeId" />
+    <result column="test_id" jdbcType="VARCHAR" property="testId" />
     <result column="node_path" jdbcType="VARCHAR" property="nodePath" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -13,7 +14,6 @@
     <result column="method" jdbcType="VARCHAR" property="method" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-    <result column="test_id" jdbcType="VARCHAR" property="testId" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="num" jdbcType="INTEGER" property="num" />
     <result column="other_test_name" jdbcType="VARCHAR" property="otherTestName" />
@@ -22,14 +22,16 @@
     <result column="demand_id" jdbcType="VARCHAR" property="demandId" />
     <result column="demand_name" jdbcType="VARCHAR" property="demandName" />
     <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="custom_num" jdbcType="VARCHAR" property="customNum" />
     <result column="step_model" jdbcType="VARCHAR" property="stepModel" />
+    <result column="custom_num" jdbcType="VARCHAR" property="customNum" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="original_status" jdbcType="VARCHAR" property="originalStatus" />
     <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
     <result column="delete_user_id" jdbcType="VARCHAR" property="deleteUserId" />
     <result column="order" jdbcType="BIGINT" property="order" />
     <result column="case_public" jdbcType="BIT" property="casePublic" />
+    <result column="version_id" jdbcType="VARCHAR" property="versionId" />
+    <result column="ref_id" jdbcType="VARCHAR" property="refId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseWithBLOBs">
     <result column="prerequisite" jdbcType="LONGVARCHAR" property="prerequisite" />
@@ -98,11 +100,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-      id
-      , node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`,
-    create_time, update_time, test_id, sort, num, other_test_name, review_status, tags, 
-    demand_id, demand_name, `status`, custom_num, step_model, create_user, original_status, 
-    delete_time, delete_user_id, `order`, case_public
+    id, node_id, test_id, node_path, project_id, `name`, `type`, maintainer, priority, 
+    `method`, create_time, update_time, sort, num, other_test_name, review_status, tags, 
+    demand_id, demand_name, `status`, step_model, custom_num, create_user, original_status, 
+    delete_time, delete_user_id, `order`, case_public, version_id, ref_id
   </sql>
   <sql id="Blob_Column_List">
     prerequisite, remark, steps, step_description, expected_result, custom_fields
@@ -156,30 +157,31 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
-      insert into test_case (id, node_id, node_path,
-                             project_id, `name`, `type`,
-                             maintainer, priority, `method`,
-                             create_time, update_time, test_id,
+    insert into test_case (id, node_id, test_id, 
+      node_path, project_id, `name`, 
+      `type`, maintainer, priority, 
+      `method`, create_time, update_time, 
       sort, num, other_test_name, 
       review_status, tags, demand_id, 
-                             demand_name, `status`, custom_num,
-                             step_model, create_user, original_status,
+      demand_name, `status`, step_model, 
+      custom_num, create_user, original_status, 
       delete_time, delete_user_id, `order`, 
-                             case_public, prerequisite, remark,
-                             steps, step_description, expected_result,
+      case_public, version_id, ref_id, 
+      prerequisite, remark, steps, 
+      step_description, expected_result, 
       custom_fields)
-      values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR},
-              #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
-              #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR},
-              #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{testId,jdbcType=VARCHAR},
+    values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, 
+      #{nodePath,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, 
+      #{method,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{otherTestName,jdbcType=VARCHAR}, 
       #{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR}, 
-              #{demandName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR},
-              #{stepModel,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR},
+      #{demandName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, 
+      #{customNum,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, 
       #{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, 
-              #{casePublic,jdbcType=BIT}, #{prerequisite,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR},
-              #{steps,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR},
-              #{expectedResult,jdbcType=LONGVARCHAR},
+      #{casePublic,jdbcType=BIT}, #{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, 
+      #{prerequisite,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}, 
+      #{stepDescription,jdbcType=LONGVARCHAR}, #{expectedResult,jdbcType=LONGVARCHAR}, 
       #{customFields,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
@@ -191,6 +193,9 @@
       <if test="nodeId != null">
         node_id,
       </if>
+      <if test="testId != null">
+        test_id,
+      </if>
       <if test="nodePath != null">
         node_path,
       </if>
@@ -218,9 +223,6 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="testId != null">
-        test_id,
-      </if>
       <if test="sort != null">
         sort,
       </if>
@@ -244,13 +246,13 @@
       </if>
       <if test="status != null">
         `status`,
-      </if>
-      <if test="customNum != null">
-        custom_num,
       </if>
       <if test="stepModel != null">
         step_model,
       </if>
+      <if test="customNum != null">
+        custom_num,
+      </if>
       <if test="createUser != null">
         create_user,
       </if>
@@ -269,6 +271,12 @@
       <if test="casePublic != null">
         case_public,
       </if>
+      <if test="versionId != null">
+        version_id,
+      </if>
+      <if test="refId != null">
+        ref_id,
+      </if>
       <if test="prerequisite != null">
         prerequisite,
       </if>
@@ -295,6 +303,9 @@
       <if test="nodeId != null">
         #{nodeId,jdbcType=VARCHAR},
       </if>
+      <if test="testId != null">
+        #{testId,jdbcType=VARCHAR},
+      </if>
       <if test="nodePath != null">
         #{nodePath,jdbcType=VARCHAR},
       </if>
@@ -322,9 +333,6 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=BIGINT},
       </if>
-      <if test="testId != null">
-        #{testId,jdbcType=VARCHAR},
-      </if>
       <if test="sort != null">
         #{sort,jdbcType=INTEGER},
       </if>
@@ -348,13 +356,13 @@
       </if>
       <if test="status != null">
         #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="customNum != null">
-        #{customNum,jdbcType=VARCHAR},
       </if>
       <if test="stepModel != null">
         #{stepModel,jdbcType=VARCHAR},
       </if>
+      <if test="customNum != null">
+        #{customNum,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
@@ -373,6 +381,12 @@
       <if test="casePublic != null">
         #{casePublic,jdbcType=BIT},
       </if>
+      <if test="versionId != null">
+        #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="refId != null">
+        #{refId,jdbcType=VARCHAR},
+      </if>
       <if test="prerequisite != null">
         #{prerequisite,jdbcType=LONGVARCHAR},
       </if>
@@ -408,6 +422,9 @@
       <if test="record.nodeId != null">
         node_id = #{record.nodeId,jdbcType=VARCHAR},
       </if>
+      <if test="record.testId != null">
+        test_id = #{record.testId,jdbcType=VARCHAR},
+      </if>
       <if test="record.nodePath != null">
         node_path = #{record.nodePath,jdbcType=VARCHAR},
       </if>
@@ -435,9 +452,6 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=BIGINT},
       </if>
-      <if test="record.testId != null">
-        test_id = #{record.testId,jdbcType=VARCHAR},
-      </if>
       <if test="record.sort != null">
         sort = #{record.sort,jdbcType=INTEGER},
       </if>
@@ -461,13 +475,13 @@
       </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.customNum != null">
-        custom_num = #{record.customNum,jdbcType=VARCHAR},
       </if>
       <if test="record.stepModel != null">
         step_model = #{record.stepModel,jdbcType=VARCHAR},
       </if>
+      <if test="record.customNum != null">
+        custom_num = #{record.customNum,jdbcType=VARCHAR},
+      </if>
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
@@ -486,6 +500,12 @@
       <if test="record.casePublic != null">
         case_public = #{record.casePublic,jdbcType=BIT},
       </if>
+      <if test="record.versionId != null">
+        version_id = #{record.versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.refId != null">
+        ref_id = #{record.refId,jdbcType=VARCHAR},
+      </if>
       <if test="record.prerequisite != null">
         prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR},
       </if>
@@ -513,6 +533,7 @@
     update test_case
     set id = #{record.id,jdbcType=VARCHAR},
       node_id = #{record.nodeId,jdbcType=VARCHAR},
+      test_id = #{record.testId,jdbcType=VARCHAR},
       node_path = #{record.nodePath,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
@@ -522,7 +543,6 @@
       `method` = #{record.method,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      test_id = #{record.testId,jdbcType=VARCHAR},
       sort = #{record.sort,jdbcType=INTEGER},
       num = #{record.num,jdbcType=INTEGER},
       other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
@@ -531,14 +551,16 @@
       demand_id = #{record.demandId,jdbcType=VARCHAR},
       demand_name = #{record.demandName,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=VARCHAR},
-      custom_num = #{record.customNum,jdbcType=VARCHAR},
       step_model = #{record.stepModel,jdbcType=VARCHAR},
+      custom_num = #{record.customNum,jdbcType=VARCHAR},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       original_status = #{record.originalStatus,jdbcType=VARCHAR},
       delete_time = #{record.deleteTime,jdbcType=BIGINT},
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
       case_public = #{record.casePublic,jdbcType=BIT},
+      version_id = #{record.versionId,jdbcType=VARCHAR},
+      ref_id = #{record.refId,jdbcType=VARCHAR},
       prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR},
       remark = #{record.remark,jdbcType=LONGVARCHAR},
       steps = #{record.steps,jdbcType=LONGVARCHAR},
@@ -553,6 +575,7 @@
     update test_case
     set id = #{record.id,jdbcType=VARCHAR},
       node_id = #{record.nodeId,jdbcType=VARCHAR},
+      test_id = #{record.testId,jdbcType=VARCHAR},
       node_path = #{record.nodePath,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
@@ -562,7 +585,6 @@
       `method` = #{record.method,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      test_id = #{record.testId,jdbcType=VARCHAR},
       sort = #{record.sort,jdbcType=INTEGER},
       num = #{record.num,jdbcType=INTEGER},
       other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
@@ -571,14 +593,16 @@
       demand_id = #{record.demandId,jdbcType=VARCHAR},
       demand_name = #{record.demandName,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=VARCHAR},
-      custom_num = #{record.customNum,jdbcType=VARCHAR},
       step_model = #{record.stepModel,jdbcType=VARCHAR},
+      custom_num = #{record.customNum,jdbcType=VARCHAR},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       original_status = #{record.originalStatus,jdbcType=VARCHAR},
       delete_time = #{record.deleteTime,jdbcType=BIGINT},
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
-      case_public = #{record.casePublic,jdbcType=BIT}
+      case_public = #{record.casePublic,jdbcType=BIT},
+      version_id = #{record.versionId,jdbcType=VARCHAR},
+      ref_id = #{record.refId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -589,6 +613,9 @@
       <if test="nodeId != null">
         node_id = #{nodeId,jdbcType=VARCHAR},
       </if>
+      <if test="testId != null">
+        test_id = #{testId,jdbcType=VARCHAR},
+      </if>
       <if test="nodePath != null">
         node_path = #{nodePath,jdbcType=VARCHAR},
       </if>
@@ -616,9 +643,6 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=BIGINT},
       </if>
-      <if test="testId != null">
-        test_id = #{testId,jdbcType=VARCHAR},
-      </if>
       <if test="sort != null">
         sort = #{sort,jdbcType=INTEGER},
       </if>
@@ -642,13 +666,13 @@
       </if>
       <if test="status != null">
         `status` = #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="customNum != null">
-        custom_num = #{customNum,jdbcType=VARCHAR},
       </if>
       <if test="stepModel != null">
         step_model = #{stepModel,jdbcType=VARCHAR},
       </if>
+      <if test="customNum != null">
+        custom_num = #{customNum,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
@@ -667,6 +691,12 @@
       <if test="casePublic != null">
         case_public = #{casePublic,jdbcType=BIT},
       </if>
+      <if test="versionId != null">
+        version_id = #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="refId != null">
+        ref_id = #{refId,jdbcType=VARCHAR},
+      </if>
       <if test="prerequisite != null">
         prerequisite = #{prerequisite,jdbcType=LONGVARCHAR},
       </if>
@@ -691,6 +721,7 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
     update test_case
     set node_id = #{nodeId,jdbcType=VARCHAR},
+      test_id = #{testId,jdbcType=VARCHAR},
       node_path = #{nodePath,jdbcType=VARCHAR},
       project_id = #{projectId,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
@@ -700,7 +731,6 @@
       `method` = #{method,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
-          test_id          = #{testId,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
       num = #{num,jdbcType=INTEGER},
       other_test_name = #{otherTestName,jdbcType=VARCHAR},
@@ -709,14 +739,16 @@
       demand_id = #{demandId,jdbcType=VARCHAR},
       demand_name = #{demandName,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=VARCHAR},
-          custom_num       = #{customNum,jdbcType=VARCHAR},
       step_model = #{stepModel,jdbcType=VARCHAR},
+      custom_num = #{customNum,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=VARCHAR},
       original_status = #{originalStatus,jdbcType=VARCHAR},
       delete_time = #{deleteTime,jdbcType=BIGINT},
       delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
       case_public = #{casePublic,jdbcType=BIT},
+      version_id = #{versionId,jdbcType=VARCHAR},
+      ref_id = #{refId,jdbcType=VARCHAR},
       prerequisite = #{prerequisite,jdbcType=LONGVARCHAR},
       remark = #{remark,jdbcType=LONGVARCHAR},
       steps = #{steps,jdbcType=LONGVARCHAR},
@@ -728,6 +760,7 @@
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestCase">
     update test_case
     set node_id = #{nodeId,jdbcType=VARCHAR},
+      test_id = #{testId,jdbcType=VARCHAR},
       node_path = #{nodePath,jdbcType=VARCHAR},
       project_id = #{projectId,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
@@ -737,7 +770,6 @@
       `method` = #{method,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
-          test_id         = #{testId,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
       num = #{num,jdbcType=INTEGER},
       other_test_name = #{otherTestName,jdbcType=VARCHAR},
@@ -746,14 +778,16 @@
       demand_id = #{demandId,jdbcType=VARCHAR},
       demand_name = #{demandName,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=VARCHAR},
-          custom_num      = #{customNum,jdbcType=VARCHAR},
       step_model = #{stepModel,jdbcType=VARCHAR},
+      custom_num = #{customNum,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=VARCHAR},
       original_status = #{originalStatus,jdbcType=VARCHAR},
       delete_time = #{deleteTime,jdbcType=BIGINT},
       delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
-          case_public     = #{casePublic,jdbcType=BIT}
+      case_public = #{casePublic,jdbcType=BIT},
+      version_id = #{versionId,jdbcType=VARCHAR},
+      ref_id = #{refId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -12,6 +12,9 @@
             <if test="request.name != null and request.name != ''">
                 AND project_version.name LIKE #{request.name, jdbcType=VARCHAR}
             </if>
+            <if test="request.latest != null and request.latest != ''">
+                AND project_version.latest = #{request.latest, jdbcType=INTEGER}
+            </if>
             <if test="request.filters != null and request.filters.size() > 0">
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
                     <if test="values != null and values.size() > 0">

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

@@ -38,7 +38,7 @@ public interface ExtTestCaseMapper {
      * @param request
      * @return
      */
-    List<TestCase> getTestCaseByNotInPlan(@Param("request") QueryTestCaseRequest request);
+    List<TestCaseDTO> getTestCaseByNotInPlan(@Param("request") QueryTestCaseRequest request);
 
     /**
      * 获取不在测试缺陷中的用例
@@ -54,7 +54,7 @@ public interface ExtTestCaseMapper {
      * @param request
      * @return
      */
-    List<TestCase> getTestCaseByNotInReview(@Param("request") QueryTestCaseRequest request);
+    List<TestCaseDTO> getTestCaseByNotInReview(@Param("request") QueryTestCaseRequest request);
 
     /**
      * 检查某工作空间下是否有某用例

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

@@ -83,10 +83,18 @@
         update test_case set custom_num = num where (custom_num is null or custom_num = '') and project_id = #{projectId}
     </update>
 
-    <select id="getTestCaseByNotInReview" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status from test_case
-        as test_case
+    <select id="getTestCaseByNotInReview" resultType="io.metersphere.track.dto.TestCaseDTO">
+        select
+        test_case.id,
+        test_case.name,
+        test_case.priority,
+        test_case.type,
+        test_case.review_status,
+        project_version.name as versionName,
+        project_version.id as versionId
+        from test_case
         left join test_case_review_test_case as T2 on test_case.id=T2.case_id and T2.review_id =#{request.reviewId}
+        left join project_version on test_case.version_id = project_version.id
         <include refid="notInQueryWhereCondition"/>
         and T2.case_id is null
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
@@ -119,14 +127,44 @@
                     #{nodeId}
                 </foreach>
             </if>
+            <if test="request.versionId != null">
+                and test_case.version_id = #{request.versionId}
+            </if>
+            <if test="request.refId != null">
+                and test_case.ref_id = #{request.refId}
+            </if>
+            <if test="request.versionId == null and request.refId == null and request.id == null">
+                AND (
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version
+                ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+                WHERE ref_id = test_case.ref_id
+                LIMIT 1)
+                OR
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version ON tmp.project_id = project_version.project_id AND
+                tmp.version_id = project_version.id
+                WHERE ref_id = test_case.ref_id
+                GROUP BY ref_id
+                HAVING MAX(latest) = 0
+                ORDER BY MAX(project_version.create_time) DESC
+                LIMIT 1)
+                )
+            </if>
             <include refid="filters"/>
         </where>
     </sql>
 
-    <select id="getTestCaseByNotInPlan" resultType="io.metersphere.base.domain.TestCase">
+    <select id="getTestCaseByNotInPlan" resultType="io.metersphere.track.dto.TestCaseDTO">
         select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status,
-        test_case.num, test_case.custom_num, test_case.priority, test_case.tags, test_case.create_time, test_case.update_time
-        from test_case as test_case
+        test_case.num, test_case.custom_num, test_case.priority, test_case.tags, test_case.create_time,
+        test_case.update_time,
+        project_version.name versionName, test_case.version_id versionId
+        from test_case
+        left join project_version on project_version.project_id = test_case.project_id and project_version.id =
+        test_case.version_id
         <if test="!request.repeatCase">
             left join test_plan_test_case as T2 on test_case.id=T2.case_id and T2.plan_id =#{request.planId}
         </if>
@@ -168,6 +206,8 @@
     <select id="list" resultType="io.metersphere.track.dto.TestCaseDTO">
         select
         deleteUser.name AS delete_user_id,test_case.delete_time,
+        project_version.name as versionName,
+        project_version.id as versionId,
         <if test="request.selectFields != null and request.selectFields.size() > 0">
             <foreach collection="request.selectFields" item="field" separator=",">
                 ${field}
@@ -185,6 +225,8 @@
         from test_case left join user u on test_case.create_user=u.id
         left join user deleteUser on test_case.delete_user_id=deleteUser.id
         left join project on test_case.project_id = project.id
+        left join project_version on project.id = project_version.project_id and project_version.id =
+        test_case.version_id
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
@@ -407,6 +449,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='version_id'">
+                            and test_case.version_id in
+                            <foreach collection="values" open="(" close=")" separator="," item="value">
+                                #{value}
+                            </foreach>
+                        </when>
                     </choose>
                 </if>
                 <if test="key=='status' and (values == null || values.size() == 0)">
@@ -474,6 +522,32 @@
             <if test="request.caseCoverage == 'coverage' ">
                 and test_case.id in (select distinct test_case_test.test_case_id from test_case_test)
             </if>
+            <if test="request.versionId != null">
+                and test_case.version_id = #{request.versionId}
+            </if>
+            <if test="request.refId != null">
+                and test_case.ref_id = #{request.refId}
+            </if>
+            <if test="request.versionId == null and request.refId == null and request.id == null">
+                AND (
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version
+                ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+                WHERE ref_id = test_case.ref_id
+                LIMIT 1)
+                OR
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version ON tmp.project_id = project_version.project_id AND
+                tmp.version_id = project_version.id
+                WHERE ref_id = test_case.ref_id
+                GROUP BY ref_id
+                HAVING MAX(latest) = 0
+                ORDER BY MAX(project_version.create_time) DESC
+                LIMIT 1)
+                )
+            </if>
         </where>
     </sql>
 

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

@@ -171,6 +171,32 @@
             <if test="request.method != null">
                 and test_case.method = #{request.method}
             </if>
+            <if test="request.versionId != null">
+                and test_case.version_id = #{request.versionId}
+            </if>
+            <if test="request.refId != null">
+                and test_case.ref_id = #{request.refId}
+            </if>
+            <if test="request.versionId == null and request.refId == null and request.id == null">
+                AND (
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version
+                ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+                WHERE ref_id = test_case.ref_id
+                LIMIT 1)
+                OR
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version ON tmp.project_id = project_version.project_id AND
+                tmp.version_id = project_version.id
+                WHERE ref_id = test_case.ref_id
+                GROUP BY ref_id
+                HAVING MAX(latest) = 0
+                ORDER BY MAX(project_version.create_time) DESC
+                LIMIT 1)
+                )
+            </if>
             and test_case.status != 'Trash'
             <include refid="filter"/>
         </where>
@@ -211,6 +237,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='version_id'">
+                            and test_case.version_id in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
                         <otherwise>
                             and test_plan_test_case.status in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
@@ -232,11 +264,13 @@
         test_plan_test_case.actual_result,
         test_plan_test_case.update_time, test_plan_test_case.create_time,test_case_node.name as model, project.name as
         projectName,test_plan_test_case.issues as issues,test_plan_test_case.issues_count as issuesCount,
-        test_plan_test_case.plan_id as planId
+        test_plan_test_case.plan_id as planId,test_case.version_id as versionId,
+        project_version.name as versionName
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id
         left join test_case_node on test_case_node.id = test_case.node_id
         inner join project on project.id = test_case.project_id
+        left join project_version on project_version.id = test_case.version_id and project.id = project_version.project_id
         <include refid="queryWhereCondition"/>
         <if test="request.orders != null and request.orders.size() > 0">
             order by

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

@@ -104,11 +104,13 @@
         test_case.custom_num) as customNum, test_case.review_status,
         test_case.remark as remark, test_case.maintainer, test_case.steps as steps, test_case.node_id as nodeId,
         test_case_node.name as model,
-        project.name as projectName
+        project.name as projectName,
+        project_version.name as versionName,project_version.id as versionId
         from test_case_review_test_case
         inner join test_case on test_case_review_test_case.case_id = test_case.id
         left join test_case_node on test_case_node.id=test_case.node_id
         inner join project on project.id = test_case.project_id
+        left join project_version on project_version.project_id = project.id and test_case.version_id = project_version.id
         <include refid="queryWhereCondition"/>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
@@ -165,6 +167,32 @@
             <if test="request.method != null">
                 and test_case.method = #{request.method}
             </if>
+            <if test="request.versionId != null">
+                and test_case.version_id = #{request.versionId}
+            </if>
+            <if test="request.refId != null">
+                and test_case.ref_id = #{request.refId}
+            </if>
+            <if test="request.versionId == null and request.refId == null and request.id == null">
+                AND (
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version
+                ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+                WHERE ref_id = test_case.ref_id
+                LIMIT 1)
+                OR
+                version_id = (SELECT project_version.id
+                FROM test_case tmp
+                JOIN project_version ON tmp.project_id = project_version.project_id AND
+                tmp.version_id = project_version.id
+                WHERE ref_id = test_case.ref_id
+                GROUP BY ref_id
+                HAVING MAX(latest) = 0
+                ORDER BY MAX(project_version.create_time) DESC
+                LIMIT 1)
+                )
+            </if>
             <include refid="filter"/>
         </where>
     </sql>
@@ -203,6 +231,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='version_id'">
+                            and test_case.version_id in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
                     </choose>
                 </if>
             </foreach>

backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java

@@ -71,4 +71,14 @@ public class BaseQueryRequest {
      * 要查询的字段
      */
     private List<String> selectFields;
+
+    /**
+     * 版本 ID
+     */
+    private String versionId;
+
+    /**
+     * 版本来源字段
+     */
+    private String refId;
 }

backend/src/main/java/io/metersphere/controller/request/ProjectVersionRequest.java

@@ -12,6 +12,7 @@ public class ProjectVersionRequest {
     private String name;
     private String projectId;
     private String createUser;
+    private Boolean latest;
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
     private Map<String, Object> combine;

backend/src/main/java/io/metersphere/track/controller/TestCaseController.java

@@ -133,7 +133,7 @@ public class TestCaseController {
     }
 
     @PostMapping("/relate/{goPage}/{pageSize}")
-    public Pager<List<TestCase>> getTestCaseRelateList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
+    public Pager<List<TestCaseDTO>> getTestCaseRelateList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
 //        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return testCaseService.getTestCaseRelateList(request, goPage, pageSize);
     }
@@ -183,7 +183,7 @@ public class TestCaseController {
     }
 
     @PostMapping("/reviews/case/{goPage}/{pageSize}")
-    public Pager<List<TestCase>> getReviewCase(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
+    public Pager<List<TestCaseDTO>> getReviewCase(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, testCaseService.getReviewCase(request));
     }
@@ -400,4 +400,19 @@ public class TestCaseController {
     public void editTestFollows(@PathVariable String caseId,@RequestBody List<String> follows) {
         testCaseService.saveFollows(caseId,follows);
     }
+
+    @GetMapping("versions/{caseId}")
+    public List<TestCaseDTO> getTestCaseVersions(@PathVariable String caseId) {
+        return testCaseService.getTestCaseVersions(caseId);
+    }
+
+    @GetMapping("get/{version}/{refId}")
+    public TestCaseDTO getTestCase(@PathVariable String version, @PathVariable String refId) {
+        return testCaseService.getTestCaseByVersion(refId, version);
+    }
+
+    @GetMapping("delete/{version}/{refId}")
+    public void deleteApiDefinition(@PathVariable String version, @PathVariable String refId) {
+        testCaseService.deleteTestCaseByVersion(refId, version);
+    }
 }

backend/src/main/java/io/metersphere/track/dto/TestCaseDTO.java

@@ -19,6 +19,7 @@ public class TestCaseDTO extends TestCaseWithBLOBs {
     private String projectName;
     private String createName;
     private String lastExecuteResult;
+    private String versionName;
 
     private List<String> caseTags = new ArrayList<>();
     private List<IssuesDao> issueList = new ArrayList<>();

backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java

@@ -24,6 +24,7 @@ public class TestPlanCaseDTO extends TestCaseWithBLOBs {
     private String maintainerName;
     private Boolean isCustomNum;
     private int issuesCount;
+    private String versionName;
 
     private List<TestCaseTestDTO> list;
     private List<IssuesDao> issueList;

backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java

@@ -19,5 +19,6 @@ public class TestReviewCaseDTO extends TestCaseWithBLOBs {
     private String issues;
     private String model;
     private String projectName;
+    private String versionName;
     private List<TestCaseTestDTO> list;
 }

backend/src/main/java/io/metersphere/track/request/testreview/QueryCaseReviewRequest.java

@@ -42,4 +42,8 @@ public class QueryCaseReviewRequest extends TestCaseReviewTestCase {
     private String projectName;
 
     private String reviewerId;
+
+    private String versionId;
+
+    private String refId;
 }

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

@@ -26,6 +26,7 @@ import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.SystemParameterService;
 import io.metersphere.service.UserService;
+import io.metersphere.track.dto.TestCaseDTO;
 import io.metersphere.track.dto.TestCaseReviewDTO;
 import io.metersphere.track.dto.TestReviewCaseDTO;
 import io.metersphere.track.dto.TestReviewDTOWithMetric;
@@ -360,7 +361,7 @@ public class TestCaseReviewService {
 
         // 如果是关联全部指令则根据条件查询未关联的案例
         if (testCaseIds.get(0).equals("all")) {
-            List<TestCase> testCases = extTestCaseMapper.getTestCaseByNotInReview(request.getRequest());
+            List<TestCaseDTO> testCases = extTestCaseMapper.getTestCaseByNotInReview(request.getRequest());
             if (!testCases.isEmpty()) {
                 testCaseIds = testCases.stream().map(testCase -> testCase.getId()).collect(Collectors.toList());
             }
@@ -634,7 +635,7 @@ public class TestCaseReviewService {
         List<String> testCaseIds = request.getTestCaseIds();
         List<String> names = new ArrayList<>();
         if (testCaseIds.get(0).equals("all")) {
-            List<TestCase> testCases = extTestCaseMapper.getTestCaseByNotInReview(request.getRequest());
+            List<TestCaseDTO> testCases = extTestCaseMapper.getTestCaseByNotInReview(request.getRequest());
             if (!testCases.isEmpty()) {
                 names = testCases.stream().map(TestCase::getName).collect(Collectors.toList());
                 testCaseIds = testCases.stream().map(testCase -> testCase.getId()).collect(Collectors.toList());

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

@@ -24,6 +24,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.OrderRequest;
+import io.metersphere.controller.request.ProjectVersionRequest;
 import io.metersphere.controller.request.ResetOrderRequest;
 import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.dto.*;
@@ -152,6 +153,8 @@ public class TestCaseService {
     private TestPlanService testPlanService;
     @Resource
     private MinderExtraNodeService minderExtraNodeService;
+    @Resource
+    private ProjectVersionService projectVersionService;
 
     private void setNode(TestCaseWithBLOBs testCase) {
         if (StringUtils.isEmpty(testCase.getNodeId()) || "default-module".equals(testCase.getNodeId())) {
@@ -183,6 +186,23 @@ public class TestCaseService {
         request.setCreateUser(SessionUtils.getUserId());
         this.setNode(request);
         request.setOrder(ServiceUtils.getNextOrder(request.getProjectId(), extTestCaseMapper::getLastOrder));
+        //直接点保存
+        if (StringUtils.isAllBlank(request.getRefId(), request.getVersionId())) {
+            //新创建测试用例，默认使用最新版本
+            request.setRefId(request.getId());
+            ProjectVersionRequest pvr = new ProjectVersionRequest();
+            pvr.setProjectId(request.getProjectId());
+            pvr.setLatest(true);
+            List<ProjectVersionDTO> pvs = projectVersionService.getVersionList(pvr);
+            if (pvs.size() == 0) {
+                MSException.throwException(Translator.get("no_version_exists"));
+            }
+            request.setVersionId(pvs.get(0).getId());
+        } else if (StringUtils.isBlank(request.getRefId()) && StringUtils.isNotBlank(request.getVersionId())) {
+            //从版本选择直接创建
+            request.setRefId(request.getId());
+        }
+
         testCaseMapper.insert(request);
         saveFollows(request.getId(), request.getFollows());
         return request;
@@ -245,6 +265,22 @@ public class TestCaseService {
     public int editTestCase(TestCaseWithBLOBs testCase) {
         checkTestCustomNum(testCase);
         testCase.setUpdateTime(System.currentTimeMillis());
+        // 更新数据
+        TestCaseExample example = new TestCaseExample();
+        example.createCriteria().andIdEqualTo(testCase.getId()).andVersionIdEqualTo(testCase.getVersionId());
+        if (testCaseMapper.updateByExampleSelective(testCase, example) == 0) {
+            // 插入新版本的数据
+            TestCaseWithBLOBs oldTestCase = testCaseMapper.selectByPrimaryKey(testCase.getId());
+            testCase.setId(UUID.randomUUID().toString());
+            testCase.setNum(oldTestCase.getNum());
+            testCase.setVersionId(testCase.getVersionId());
+            testCase.setCreateTime(System.currentTimeMillis());
+            testCase.setUpdateTime(System.currentTimeMillis());
+            testCase.setCreateUser(SessionUtils.getUserId());
+            testCase.setOrder(oldTestCase.getOrder());
+            testCase.setRefId(oldTestCase.getRefId());
+            testCaseMapper.insertSelective(testCase);
+        }
         return testCaseMapper.updateByPrimaryKeySelective(testCase);
     }
 
@@ -375,12 +411,6 @@ public class TestCaseService {
         return extTestCaseMapper.deleteToGc(testCase);
     }
 
-    public int deleteTestCasePublic(String testCaseId) {
-        TestCase testCase = new TestCase();
-        testCase.setId(testCaseId);
-        return extTestCaseMapper.deletePublic(testCase);
-    }
-
     public List<TestCaseDTO> listTestCase(QueryTestCaseRequest request) {
         this.initRequest(request, true);
         setDefaultOrder(request);
@@ -403,6 +433,7 @@ public class TestCaseService {
         return returnList;
     }
 
+
     public void setDefaultOrder(QueryTestCaseRequest request) {
         List<OrderRequest> orders = ServiceUtils.getDefaultSortOrder(request.getOrders());
         OrderRequest order = new OrderRequest();
@@ -486,7 +517,7 @@ public class TestCaseService {
      * @param request
      * @return
      */
-    public Pager<List<TestCase>> getTestCaseRelateList(QueryTestCaseRequest request, int goPage, int pageSize) {
+    public Pager<List<TestCaseDTO>> getTestCaseRelateList(QueryTestCaseRequest request, int goPage, int pageSize) {
         setDefaultOrder(request);
         request.getOrders().forEach(order -> {
             order.setPrefix("test_case");
@@ -498,7 +529,7 @@ public class TestCaseService {
         return PageUtils.setPageInfo(page, getTestCaseByNotInPlan(request));
     }
 
-    public List<TestCase> getTestCaseByNotInPlan(QueryTestCaseRequest request) {
+    public List<TestCaseDTO> getTestCaseByNotInPlan(QueryTestCaseRequest request) {
         return extTestCaseMapper.getTestCaseByNotInPlan(request);
     }
 
@@ -523,7 +554,7 @@ public class TestCaseService {
         });
     }
 
-    public List<TestCase> getReviewCase(QueryTestCaseRequest request) {
+    public List<TestCaseDTO> getReviewCase(QueryTestCaseRequest request) {
         setDefaultOrder(request);
         request.getOrders().forEach(order -> {
             order.setPrefix("test_case");
@@ -755,6 +786,8 @@ public class TestCaseService {
      */
     public void updateImportDataCarryId(List<TestCaseWithBLOBs> testCases, String projectId) {
         Map<String, String> nodePathMap = testCaseNodeService.createNodeByTestCases(testCases, projectId);
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
 
         /*
         获取用例的“网页上所显示id”与“数据库ID”映射。
@@ -769,9 +802,7 @@ public class TestCaseService {
         Map<Integer, String> numIdMap = testCasesList.stream()
                 .collect(Collectors.toMap(TestCase::getNum, TestCase::getId));
 
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
-        try {
+
         if (!testCases.isEmpty()) {
             AtomicInteger sort = new AtomicInteger();
             testCases.forEach(testcase -> {
@@ -783,7 +814,7 @@ public class TestCaseService {
             });
         }
         sqlSession.flushStatements();
-        } finally {
+        if (sqlSession != null && sqlSessionFactory != null) {
             SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
         }
     }
@@ -1068,7 +1099,8 @@ public class TestCaseService {
                                 tags += arr.getString(i) + ",";
                             }
                         }
-                    }catch (Exception e){}
+                    } catch (Exception e) {
+                    }
                     list.add(tags);
                 } else if (StringUtils.equalsAnyIgnoreCase(head, "Prerequisite", "前置條件", "前置条件")) {
                     list.add(model.getPrerequisite());
@@ -1159,7 +1191,8 @@ public class TestCaseService {
                             }
                         }
                     }
-                }catch (Exception e){}
+                } catch (Exception e) {
+                }
             }
             customSelectValueMap.put(dto.getName(), map);
         }
@@ -1259,7 +1292,8 @@ public class TestCaseService {
                     }
                 }
                 data.setCustomDatas(map);
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
             list.add(data);
         });
         return list;
@@ -1267,6 +1301,7 @@ public class TestCaseService {
 
     /**
      * 更新自定义字段
+     *
      * @param request
      */
     public void editTestCaseBath(TestCaseBatchRequest request) {
@@ -2094,6 +2129,7 @@ public class TestCaseService {
 
     /**
      * 用例自定义排序
+     *
      * @param request
      */
     public void updateOrder(ResetOrderRequest request) {
@@ -2215,4 +2251,40 @@ public class TestCaseService {
             SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
         }
     }
+
+    public List<TestCaseDTO> getTestCaseVersions(String caseId) {
+        TestCaseWithBLOBs testCase = testCaseMapper.selectByPrimaryKey(caseId);
+        if (testCase == null) {
+            return new ArrayList<>();
+        }
+        QueryTestCaseRequest request = new QueryTestCaseRequest();
+        request.setRefId(testCase.getRefId());
+        return this.listTestCase(request);
+    }
+
+    public TestCaseDTO getTestCaseByVersion(String refId, String version) {
+        QueryTestCaseRequest request = new QueryTestCaseRequest();
+        request.setRefId(refId);
+        request.setVersionId(version);
+        List<TestCaseDTO> testCaseList = this.listTestCase(request);
+        if (CollectionUtils.isEmpty(testCaseList)) {
+            return null;
+        }
+        return testCaseList.get(0);
+    }
+
+    public void deleteTestCaseByVersion(String refId, String version) {
+        TestCaseExample e = new TestCaseExample();
+        e.createCriteria().andRefIdEqualTo(refId).andVersionIdEqualTo(version);
+        List<TestCaseWithBLOBs> testCaseList = testCaseMapper.selectByExampleWithBLOBs(e);
+        if (CollectionUtils.isNotEmpty(testCaseList)) {
+            testCaseMapper.deleteByExample(e);
+        }
+    }
+
+    public int deleteTestCasePublic(String testCaseId) {
+        TestCase testCase = new TestCase();
+        testCase.setId(testCaseId);
+        return extTestCaseMapper.deletePublic(testCase);
+    }
 }

backend/src/main/resources/db/migration/V105__v1.17_release.sql

@@ -172,3 +172,21 @@ alter table project
 
 alter table project
     add clean_load_report_expr varchar(50) null;
+
+-- test_case
+ALTER TABLE test_case
+    ADD version_id VARCHAR(50) NULL COMMENT '版本ID';
+
+ALTER TABLE test_case
+    ADD ref_id VARCHAR(50) NULL COMMENT '指向初始版本ID';
+
+CREATE INDEX test_case_version_id_index ON test_case (version_id);
+
+CREATE INDEX test_case_ref_id_index ON test_case (ref_id);
+
+UPDATE test_case
+SET ref_id = id;
+
+UPDATE test_case
+    INNER JOIN project_version ON project_version.project_id = test_case.project_id
+    SET version_id = project_version.id;

backend/src/main/resources/i18n/messages_en_US.properties

@@ -296,3 +296,5 @@ environment_group_exist = already exists
 error_report_library=Error report
 issue_jira_info_error=Check the service integration information or Jira project ID
 error_code_is_unique=Error code is not unique
+
+no_version_exists=version not exists

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -295,3 +295,4 @@ environment_group_exist = 已存在
 error_report_library=误报库
 issue_jira_info_error=请检查服务集成信息或Jira项目ID
 error_code_is_unique=错误代码不可重复
+no_version_exists=不存在版本！请先创建项目的版本

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -295,3 +295,5 @@ environment_group_exist = 已存在
 error_report_library=誤報庫
 issue_jira_info_error=請檢查服務集成信息或Jira項目ID
 error_code_is_unique=錯誤代碼不可重複
+
+no_version_exists=不存在版本！請先創建項目的版本

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

@@ -70,6 +70,9 @@
             :right-tip="$t('test_track.case.minder')"
             :right-content="$t('test_track.case.minder')"
             :middle-button-enable="false">
+            <template v-slot:version>
+              <version-select v-xpack :project-id="projectId" @changeVersion="changeVersion"/>
+            </template>
             <test-case-list
               v-if="activeDom === 'left'"
               :checkRedirectID="checkRedirectID"
@@ -77,6 +80,7 @@
               :tree-nodes="treeNodes"
               :trash-enable="false"
               :public-enable="false"
+              :current-version="currentVersion"
               @refreshTable="refresh"
               @testCaseEdit="editTestCase"
               @testCaseCopy="copyTestCase"
@@ -110,6 +114,7 @@
               @refresh="refreshTable"
               @caseEdit="handleCaseCreateOrEdit($event,'edit')"
               @caseCreate="handleCaseCreateOrEdit($event,'add')"
+              @checkout="checkout($event, item)"
               :read-only="testCaseReadOnly"
               :tree-nodes="treeNodes"
               :select-node="selectNode"
@@ -136,6 +141,9 @@
               ref="testCaseEditShow">
             </test-case-edit-show>
           </div>
+          <template v-slot:version>
+            <version-select v-xpack :project-id="projectId" @changeVersion="changeVersion"/>
+          </template>
         </el-tab-pane>
         <el-tab-pane name="add" v-if="hasPermission('PROJECT_TRACK_CASE:READ+CREATE')">
           <template v-slot:label>
@@ -184,6 +192,9 @@ import IsChangeConfirm from "@/business/components/common/components/IsChangeCon
 import {openMinderConfirm, saveMinderConfirm} from "@/business/components/track/common/minder/minderUtils";
 import TestCaseEditShow from "@/business/components/track/case/components/TestCaseEditShow";
 
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./version/VersionSelect.vue") : {};
+
 export default {
   name: "TestCase",
   components: {
@@ -192,7 +203,8 @@ export default {
     MsTabButton,
     TestCaseNodeTree,
     MsMainContainer,
-    MsAsideContainer, MsContainer, TestCaseList, NodeTree, TestCaseEdit, SelectMenu, TestCaseEditShow
+    MsAsideContainer, MsContainer, TestCaseList, NodeTree, TestCaseEdit, SelectMenu, TestCaseEditShow,
+    'VersionSelect': VersionSelect.default,
   },
   comments: {},
   data() {
@@ -215,7 +227,8 @@ export default {
       tmpActiveDom: null,
       total: 0,
       publicTotal: 0,
-      tmpPath: null
+      tmpPath: null,
+      currentVersion: null,
     };
   },
   mounted() {
@@ -617,6 +630,22 @@ export default {
         this.activeName = "trash"
       }
 
+    },
+    changeVersion(currentVersion) {
+      this.currentVersion = currentVersion || null;
+    },
+    checkout(testCase, item) {
+      Object.assign(item.testCaseInfo, testCase)
+      //子组件先变更 copy 状态，再执行初始化操作
+      this.$refs.testCaseEdit[0].changeType("copy");
+      this.$refs.testCaseEdit[0].initEdit(item.testCaseInfo, () => {
+        this.$nextTick(() => {
+          let vh = this.$refs.testCaseEdit[0].$refs.versionHistory;
+          vh.getVersionOptionList(vh.handleVersionOptions);
+          vh.show = false;
+          vh.loading = false;
+        });
+      });
     }
   }
 };
@@ -640,4 +669,8 @@ export default {
   padding-right: 100%;
 }
 
+.version-select {
+  padding-left: 10px;
+}
+
 </style>

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

@@ -18,6 +18,12 @@
           <el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="form.id">
             {{ $t('operating_log.change_history') }}
           </el-link>
+          <!--  版本历史 -->
+          <ms-version-history v-xpack
+                              ref="versionHistory"
+                              :version-data="versionData"
+                              :current-id="currentTestCaseInfo.id"
+                              @compare="compare" @checkout="checkout" @create="create" @del="del"/>
           <el-dropdown split-button type="primary" class="ms-api-buttion" @click="handleCommand"
                        @command="handleCommand" size="small" style="float: right;margin-right: 20px">
             {{ $t('commons.save') }}
@@ -179,6 +185,9 @@ import MsChangeHistory from "../../../history/ChangeHistory";
 import {getTestTemplate} from "@/network/custom-field-template";
 import CustomFiledFormItem from "@/business/components/common/components/form/CustomFiledFormItem";
 
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const versionHistory = requireComponent.keys().length > 0 ? requireComponent("./version/VersionHistory.vue") : {};
+
 export default {
   name: "TestCaseEdit",
   components: {
@@ -194,7 +203,8 @@ export default {
     ReviewCommentItem,
     TestCaseComment, MsPreviousNextButton, MsInputTag, CaseComment, MsDialogFooter, TestCaseAttachment,
     MsTestCaseStepRichText,
-    MsChangeHistory
+    MsChangeHistory,
+    'MsVersionHistory': versionHistory.default,
   },
   data() {
     return {
@@ -282,7 +292,8 @@ export default {
         id: 'id',
         label: 'name',
       },
-      tabId: getUUID()
+      tabId: getUUID(),
+      versionData: [],
     };
   },
   props: {
@@ -422,6 +433,9 @@ export default {
     } else {
       this.isXpack = false;
     }
+    if (hasLicense()) {
+      this.getVersionHistory();
+    }
   },
   methods: {
     alert:alert,
@@ -545,7 +559,7 @@ export default {
           initFuc(testCase);
         });
     },
-    initEdit(testCase) {
+    initEdit(testCase, callback) {
       if (window.history && window.history.pushState) {
         history.pushState(null, null, document.URL);
         window.addEventListener('popstate', this.close);
@@ -586,6 +600,9 @@ export default {
         this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules);
         this.reload();
       }
+      if (callback) {
+        callback();
+      }
     },
     handlePre() {
       this.index--;
@@ -726,10 +743,14 @@ export default {
             this.close();
           }
           this.form.id = response.data.id;
+          this.currentTestCaseInfo.id = response.data.id;
 
           if (callback) {
             callback(this);
           }
+          if (hasLicense()) {
+            this.getVersionHistory();
+          }
           // 保存用例后刷新附件
         });
       }
@@ -907,6 +928,51 @@ export default {
           });
         }
       }
+    },
+    getVersionHistory() {
+      this.$get('/test/case/versions/' + this.currentTestCaseInfo.id, response => {
+        this.versionData = response.data;
+        this.$refs.versionHistory.loading = false;
+      });
+    },
+    compare(row) {
+      // console.log(row);
+    },
+    checkout(row) {
+      this.$refs.versionHistory.loading = true;
+      let testCase = this.versionData.filter(v => v.versionId === row.id)[0];
+
+      if (testCase) {
+        this.$get('test/case/get/' + testCase.id, response => {
+          let testCase = response.data;
+          this.$emit("checkout", testCase);
+          this.$refs.versionHistory.loading = false;
+        });
+      }
+    },
+    create(row) {
+      // 创建新版本
+      this.form.versionId = row.id;
+      this.saveCase();
+    },
+    del(row) {
+      let that = this;
+      this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            this.$get('/test/case/delete/' + row.id + '/' + this.form.refId, () => {
+              this.$success(this.$t('commons.delete_success'));
+              this.getVersionHistory();
+            });
+          } else {
+            that.$refs.versionHistory.loading = false;
+          }
+        }
+      });
+    },
+    changeType(type) {
+      this.type = type;
     }
   }
 }

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

@@ -140,6 +140,18 @@
           min-width="150px">
         </ms-table-column>
 
+        <ms-table-column
+          :label="$t('project.version.name')"
+          :field="item"
+          :fields-width="fieldsWidth"
+          :filters="versionFilters"
+          min-width="100px"
+          prop="versionId">
+           <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </ms-table-column>
+
         <ms-table-column
           prop="nodePath"
           :field="item"
@@ -149,8 +161,6 @@
           min-width="150px">
         </ms-table-column>
 
-
-
         <ms-table-column
           prop="updateTime"
           sortable
@@ -248,7 +258,7 @@ import {
 } from "@/common/js/tableUtils";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem";
-import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId, hasLicense} from "@/common/js/utils";
 import {getTestTemplate} from "@/network/custom-field-template";
 import {getProjectMember} from "@/network/user";
 import MsTable from "@/business/components/common/components/table/MsTable";
@@ -305,6 +315,7 @@ export default {
         components: TEST_CASE_CONFIGS,
         filters: {}
       },
+      versionFilters: [],
       graphData: {},
       priorityFilters: [
         {text: 'P0', value: 'P0'},
@@ -468,6 +479,7 @@ export default {
       type: Boolean,
       default: false,
     },
+    currentVersion: String,
   },
   computed: {
     projectId() {
@@ -495,6 +507,8 @@ export default {
     this.initTableData();
     let redirectParam = this.$route.query.dataSelectRange;
     this.checkRedirectEditPage(redirectParam);
+    // 切换tab之后版本查询
+    this.condition.versionId = this.currentVersion;
     if (this.trashEnable) {
       this.operators = this.trashOperators;
       this.batchButtons = this.trashButtons;
@@ -526,6 +540,7 @@ export default {
     }
     this.initTableData();
     this.condition.ids = null;
+    this.getVersionOptions();
   },
   watch: {
     selectNodeIds() {
@@ -570,7 +585,11 @@ export default {
         this.batchButtons = this.simpleButtons;
         this.condition.filters.status = [];
       }
-    }
+    },
+    currentVersion() {
+      this.condition.versionId = this.currentVersion;
+      this.initTableData();
+    },
   },
   methods: {
     getTemplateField() {
@@ -1093,7 +1112,16 @@ export default {
         this.$refs.testBatchMove.close();
         this.refresh();
       });
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
       }
+    },
   }
 };
 </script>

frontend/src/business/components/track/plan/view/TestPlanView.vue

@@ -19,6 +19,7 @@
         </el-menu>
       </template>
     </ms-test-plan-header-bar>
+
     <test-plan-functional v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
                           :clickType="clickType" :plan-id="planId" ref="testPlanFunctional"/>
     <test-plan-api v-if="activeIndex === 'api'" :redirectCharType="redirectCharType" :clickType="clickType"

frontend/src/business/components/track/plan/view/comonents/functional/FunctionalRelevance.vue

@@ -45,6 +45,17 @@
 
       <ms-table-column prop="name" :label="$t('commons.name')"/>
 
+      <ms-table-column
+        prop="versionId"
+        :field="item"
+        :filters="versionFilters"
+        :label="$t('commons.version')"
+        min-width="120px">
+        <template v-slot:default="scope">
+          <span>{{ scope.row.versionName }}</span>
+        </template>
+      </ms-table-column>
+
       <ms-table-column
         prop="priority"
         :filters="priorityFilters"
@@ -101,6 +112,7 @@ import MsTableColumn from "@/business/components/common/components/table/MsTable
 import MsTable from "@/business/components/common/components/table/MsTable";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTag from "@/business/components/common/components/MsTag";
+import {hasLicense, getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "FunctionalRelevance",
@@ -117,6 +129,9 @@ export default {
     MsTableAdvSearchBar,
     MsTableHeader,
   },
+  mounted(){
+    this.getVersionOptions();
+  },
   data() {
     return {
       openType: 'relevance',
@@ -134,7 +149,8 @@ export default {
         {text: 'P1', value: 'P1'},
         {text: 'P2', value: 'P2'},
         {text: 'P3', value: 'P3'}
-      ]
+      ],
+      versionFilters: []
     };
   },
   props: {
@@ -229,7 +245,17 @@ export default {
         this.projectId = projectId;
       }
       this.getNodeTree(this);
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionOptions= response.data;
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
       }
+    },
   }
 }
 </script>

frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue

@@ -57,6 +57,18 @@
           :label="$t('commons.name')"
           min-width="120px"/>
 
+        <ms-table-column
+          prop="versionId"
+          :field="item"
+          :filters="versionFilters"
+          :fields-width="fieldsWidth"
+          :label="$t('commons.version')"
+          min-width="120px">
+           <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </ms-table-column>
+
         <ms-table-column
           prop="priority"
           :field="item"
@@ -258,7 +270,7 @@ import {
   TEST_PLAN_FUNCTION_TEST_CASE,
   TokenKey,
 } from "@/common/js/constants";
-import {getCurrentProjectID, hasPermission} from "@/common/js/utils";
+import {getCurrentProjectID, hasPermission, hasLicense} from "@/common/js/utils";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
 import StatusTableItem from "../../../../common/tableItems/planview/StatusTableItem";
 import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem";
@@ -385,7 +397,7 @@ export default {
       },
       selectDataRange: "all",
       testCaseTemplate: {},
-
+      versionFilters: []
     };
   },
   props: {
@@ -396,6 +408,7 @@ export default {
     selectNodeIds: {
       type: Array
     },
+    currentVersion: null
   },
   computed: {
     editTestPlanTestCaseOrder() {
@@ -422,6 +435,10 @@ export default {
     condition() {
       this.$emit('setCondition', this.condition);
     },
+    currentVersion(){
+      this.condition.versionId = this.currentVersion;
+      this.initTableData();
+    }
   },
   created() {
     this.condition.orders = getLastTableSortField(this.tableHeaderKey);
@@ -437,6 +454,7 @@ export default {
     this.hasEditPermission = hasPermission('PROJECT_TRACK_PLAN:READ+EDIT');
     this.getMaintainerOptions();
     this.getTemplateField();
+    this.getVersionOptions();
   },
   beforeDestroy() {
     hub.$off("openFailureTestCase");
@@ -631,6 +649,16 @@ export default {
         });
       });
     },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionOptions= response.data;
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
+      }
+    },
   }
 };
 </script>

frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue

@@ -17,12 +17,16 @@
         :right-tip="$t('test_track.case.minder')"
         :right-content="$t('test_track.case.minder')"
         :middle-button-enable="false">
+        <template v-slot:version>
+          <version-select v-xpack :project-id="projectId" @changeVersion="changeVersion"/>
+        </template>
         <functional-test-case-list
           class="table-list"
           v-if="activeDom === 'left'"
           @openTestCaseRelevanceDialog="openTestCaseRelevanceDialog"
           @refresh="refresh"
           @setCondition="setCondition"
+          :current-version="currentVersion"
           :plan-id="planId"
           :clickType="clickType"
           :select-node-ids="selectNodeIds"
@@ -63,6 +67,8 @@ import TestPlanFunctionalRelevance
   from "@/business/components/track/plan/view/comonents/functional/TestPlanFunctionalRelevance";
 import IsChangeConfirm from "@/business/components/common/components/IsChangeConfirm";
 import {openMinderConfirm, saveMinderConfirm} from "@/business/components/track/common/minder/minderUtils";
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./version/VersionSelect.vue") : {};
 
 export default {
   name: "TestPlanFunctional",
@@ -74,6 +80,7 @@ export default {
     FunctionalTestCaseList,
     MsTestPlanCommonComponent,
     NodeTree,
+    'VersionSelect': VersionSelect.default,
   },
   data() {
     return {
@@ -84,7 +91,8 @@ export default {
       selectNode: {},
       condition: {},
       tmpActiveDom: null,
-      tmpPath: null
+      tmpPath: null,
+      currentVersion: null,
     };
   },
   props: [
@@ -175,6 +183,9 @@ export default {
         return true;
       }
     },
+    changeVersion(currentVersion) {
+      this.currentVersion = currentVersion || null;
+    }
   }
 };
 
@@ -184,4 +195,7 @@ export default {
 /deep/ .el-button-group > .el-button:first-child {
   padding: 4px 1px !important;
 }
+.version-select {
+  padding-left: 10px;
+}
 </style>

frontend/src/business/components/track/review/view/components/TestReviewFunction.vue

@@ -18,6 +18,9 @@
         :right-tip="$t('test_track.case.minder')"
         :right-content="$t('test_track.case.minder')"
         :middle-button-enable="false">
+        <template v-slot:version>
+          <version-select v-xpack :project-id="projectId" @changeVersion="changeVersion"/>
+        </template>
         <test-review-test-case-list
           class="table-list"
           v-if="activeDom === 'left'"
@@ -26,6 +29,7 @@
           @setCondition="setCondition"
           :review-id="reviewId"
           :clickType="clickType"
+          :current-version="currentVersion"
           ref="testPlanTestCaseList"/>
         <test-review-minder
           :tree-nodes="treeNodes"
@@ -61,6 +65,8 @@ import TestReviewMinder from "@/business/components/track/common/minder/TestRevi
 import {getCurrentProjectID} from "@/common/js/utils";
 import IsChangeConfirm from "@/business/components/common/components/IsChangeConfirm";
 import {openMinderConfirm, saveMinderConfirm} from "@/business/components/track/common/minder/minderUtils";
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./version/VersionSelect.vue") : {};
 
 export default {
   name: "TestReviewFunction",
@@ -69,7 +75,8 @@ export default {
     TestReviewMinder,
     MsTabButton,
     TestReviewTestCaseList,
-    TestReviewRelevance, MsNodeTree, MsTestPlanCommonComponent
+    TestReviewRelevance, MsNodeTree, MsTestPlanCommonComponent,
+    'VersionSelect': VersionSelect.default,
   },
   data() {
     return {
@@ -83,7 +90,8 @@ export default {
       activeDom: 'left',
       condition: {},
       tmpActiveDom: null,
-      tmpPath: null
+      tmpPath: null,
+      currentVersion : null
     }
   },
   props: [
@@ -141,6 +149,9 @@ export default {
         return true;
       }
     },
+    changeVersion(currentVersion) {
+      this.currentVersion = currentVersion || null;
+    }
   }
 }
 </script>
@@ -149,4 +160,8 @@ export default {
 /deep/ .el-button-group>.el-button:first-child {
   padding: 4px 1px !important;
 }
+
+.version-select {
+  padding-left: 10px;
+}
 </style>

frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue

@@ -34,6 +34,7 @@
                       ref="table">
 
               <el-table-column type="selection"/>
+
               <el-table-column
                 prop="name"
                 :label="$t('test_track.case.name')"
@@ -43,6 +44,18 @@
                 </template>
               </el-table-column>
 
+              <el-table-column
+                v-if="hasLicense()"
+                prop="versionName"
+                :label="$t('test_track.case.version')"
+                column-key="versionId"
+                :filters="versionFilters"
+                style="width: 100%">
+                <template v-slot:default="scope">
+                  {{ scope.row.versionName }}
+                </template>
+              </el-table-column>
+
               <el-table-column
                 prop="priority"
                 :filters="priorityFilters"
@@ -108,7 +121,7 @@ import ReviewStatus from "@/business/components/track/case/components/ReviewStat
 import elTableInfiniteScroll from 'el-table-infinite-scroll';
 import SelectMenu from "../../../common/SelectMenu";
 import {_filter} from "@/common/js/tableUtils";
-import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId, hasLicense} from "@/common/js/utils";
 
 
 export default {
@@ -138,6 +151,7 @@ export default {
         dialogFormVisible: false,
         isCheckAll: false,
         testReviews: [],
+        versionFilters: [],
         selectIds: new Set(),
         treeNodes: [],
         selectNodeIds: [],
@@ -189,10 +203,18 @@ export default {
         this.getProjectNode();
       }
     },
+    mounted() {
+      if (hasLicense()) {
+        this.getVersionOptions();
+      }
+    },
     updated() {
       this.toggleSelection(this.testReviews);
     },
     methods: {
+      hasLicense(){
+        return hasLicense();
+      },
       openTestReviewRelevanceDialog() {
         this.getProject();
         this.dialogFormVisible = true;
@@ -364,7 +386,16 @@ export default {
           });
 
         this.selectNodeIds = [];
+      },
+      getVersionOptions() {
+        if (hasLicense()) {
+          this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+            this.versionFilters = response.data.map(u => {
+              return {text: u.name, value: u.id};
+            });
+          });
         }
+      },
     }
   }
 </script>

frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue

@@ -8,6 +8,7 @@
         <ms-table-button v-permission="['PROJECT_TRACK_REVIEW:READ+RELEVANCE_OR_CANCEL']" icon="el-icon-connection"
                          :content="$t('test_track.review_view.relevance_case')"
                          @click="$emit('openTestReviewRelevanceDialog')"/>
+
       </template>
     </ms-table-header>
 
@@ -53,6 +54,18 @@
           :label="$t('commons.name')"
           min-width="120px"/>
 
+        <ms-table-column
+          prop="versionId"
+          :field="item"
+          :filters="versionFilters"
+          :fields-width="fieldsWidth"
+          :label="$t('commons.version')"
+          min-width="120px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </ms-table-column>
+
         <ms-table-column
           prop="priority"
           :field="item"
@@ -185,6 +198,7 @@ import MsTableHeaderSelectPopover from "@/business/components/common/components/
 import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
 import MsTable from "@/business/components/common/components/table/MsTable";
 import {editTestReviewTestCaseOrder} from "@/network/testCase";
+import {getCurrentProjectID, hasLicense} from "@/common/js/utils";
 
 export default {
   name: "TestReviewTestCaseList",
@@ -270,12 +284,16 @@ export default {
           {name: this.$t('test_track.review.un_pass'), id: 'UnPass'},
         ]
       },
+      versionFilters: []
     };
   },
   props: {
     reviewId: {
       type: String
     },
+    currentVersion: {
+      type: String
+    }
   },
   watch: {
     reviewId() {
@@ -287,6 +305,10 @@ export default {
     condition() {
       this.$emit('setCondition', this.condition);
     },
+    currentVersion() {
+      this.condition.versionId = this.currentVersion;
+      this.initTableData();
+    }
   },
   computed: {
     selectNodeIds() {
@@ -304,6 +326,7 @@ export default {
     this.refreshTableAndReview();
     this.isTestManagerOrTestUser = true;
     this.initTableHeader();
+    this.getVersionOptions();
   },
   methods: {
     initTableHeader() {
@@ -456,7 +479,16 @@ export default {
       if (this.$refs.table) {
         this.$refs.table.clear();
       }
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
       }
+    },
   }
 };
 </script>

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

@@ -98,6 +98,7 @@ export let CUSTOM_TABLE_HEADER = {
   TEST_CASE_REVIEW_FUNCTION_TEST_CASE: [
     {id: 'num', key: '1', label: 'commons.id'},
     {id: 'name', key: '2', label: 'commons.name'},
+    {id: 'versionId', key: 'b', label: 'commons.version'},
     {id: 'priority', key: '3', label: 'test_track.case.priority'},
     {id: 'type', key: '4', label: 'test_track.case.type'},
     {id: 'nodePath', key: '5', label: 'test_track.case.module'},
@@ -132,6 +133,7 @@ export let CUSTOM_TABLE_HEADER = {
   TEST_PLAN_FUNCTION_TEST_CASE: [
     {id: 'num', key: '1', label: 'commons.id'},
     {id: 'name', key: '2', label: 'commons.name'},
+    {id: 'versionId', key: 'b', label: 'project.version.name', xpack: true},
     {id: 'tags', key: '3', label: 'commons.tag'},
     {id: 'nodePath', key: '4', label: 'test_track.case.module'},
     {id: 'projectName', key: '5', label: 'test_track.review.review_project'},
@@ -187,6 +189,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'name', key: '2', label: 'commons.name'},
     {id: 'reviewStatus', key: '3', label: 'test_track.case.status'},
     {id: 'tags', key: '4', label: 'commons.tag'},
+    {id: 'versionId', key: 'a', label: 'project.version.name', xpack: true},
     {id: 'nodePath', key: '5', label: 'test_track.case.module'},
     {id: 'projectName', key: 'a', label: 'test_track.review.review_project'},
     {id: 'updateTime', key: '6', label: 'commons.update_time'},

frontend/src/i18n/zh-CN.js

@@ -2018,8 +2018,8 @@ export default {
         export_tip: "请切换成接口列表勾选用例导出！"
       },
       case_desc: "用例描述",
-      passing_rate: '用例通过率'
-
+      passing_rate:'用例通过率',
+      version: "版本"
     },
     plan: {
       test_plan: "测试计划",