feat: 测试用例列表添加ID展示列

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

@@ -33,5 +33,7 @@ public class TestCase implements Serializable {
 
     private Integer sort;
 
+    private Integer num;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -1053,6 +1053,66 @@ public class TestCaseExample {
             addCriterion("sort not between", value1, value2, "sort");
             return (Criteria) this;
         }
+
+        public Criteria andNumIsNull() {
+            addCriterion("num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIsNotNull() {
+            addCriterion("num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumEqualTo(Integer value) {
+            addCriterion("num =", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotEqualTo(Integer value) {
+            addCriterion("num <>", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThan(Integer value) {
+            addCriterion("num >", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("num >=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThan(Integer value) {
+            addCriterion("num <", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThanOrEqualTo(Integer value) {
+            addCriterion("num <=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIn(List<Integer> values) {
+            addCriterion("num in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotIn(List<Integer> values) {
+            addCriterion("num not in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumBetween(Integer value1, Integer value2) {
+            addCriterion("num between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("num not between", value1, value2, "num");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -16,6 +16,7 @@
     <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" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseWithBLOBs">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -81,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`, 
-    prerequisite, create_time, update_time, test_id, sort
+    prerequisite, create_time, update_time, test_id, sort, num
   </sql>
   <sql id="Blob_Column_List">
     remark, steps
@@ -139,14 +140,14 @@
       project_id, `name`, `type`, 
       maintainer, priority, `method`, 
       prerequisite, create_time, update_time, 
-      test_id, sort, remark, 
-      steps)
+      test_id, sort, num, 
+      remark, steps)
     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}, 
       #{prerequisite,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{testId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{remark,jdbcType=LONGVARCHAR}, 
-      #{steps,jdbcType=LONGVARCHAR})
+      #{testId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, 
+      #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
     insert into test_case
@@ -193,6 +194,9 @@
       <if test="sort != null">
         sort,
       </if>
+      <if test="num != null">
+        num,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -243,6 +247,9 @@
       <if test="sort != null">
         #{sort,jdbcType=INTEGER},
       </if>
+      <if test="num != null">
+        #{num,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -302,6 +309,9 @@
       <if test="record.sort != null">
         sort = #{record.sort,jdbcType=INTEGER},
       </if>
+      <if test="record.num != null">
+        num = #{record.num,jdbcType=INTEGER},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -329,6 +339,7 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       test_id = #{record.testId,jdbcType=VARCHAR},
       sort = #{record.sort,jdbcType=INTEGER},
+      num = #{record.num,jdbcType=INTEGER},
       remark = #{record.remark,jdbcType=LONGVARCHAR},
       steps = #{record.steps,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -350,7 +361,8 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       test_id = #{record.testId,jdbcType=VARCHAR},
-      sort = #{record.sort,jdbcType=INTEGER}
+      sort = #{record.sort,jdbcType=INTEGER},
+      num = #{record.num,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -397,6 +409,9 @@
       <if test="sort != null">
         sort = #{sort,jdbcType=INTEGER},
       </if>
+      <if test="num != null">
+        num = #{num,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -421,6 +436,7 @@
       update_time = #{updateTime,jdbcType=BIGINT},
       test_id = #{testId,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
+      num = #{num,jdbcType=INTEGER},
       remark = #{remark,jdbcType=LONGVARCHAR},
       steps = #{steps,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -439,7 +455,8 @@
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       test_id = #{testId,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER}
+      sort = #{sort,jdbcType=INTEGER},
+      num = #{num,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file

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

@@ -17,4 +17,6 @@ public interface ExtTestCaseMapper {
 
     List<TestCaseDTO> listBytestCaseIds(@Param("request")  QueryTestCaseRequest request);
 
+    TestCase getMaxNumByProjectId(@Param("projectId") String projectId);
+
 }

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

@@ -188,7 +188,8 @@
         </where>
     </select>
     <select id="listBytestCaseIds" resultType="io.metersphere.track.dto.TestCaseDTO">
-        select test_case.*,api_test.name as apiName,load_test.name AS performName from test_case  left join  api_test on test_case.test_id=api_test.id left join load_test on test_case.test_id=load_test.id
+        select test_case.*,api_test.name as apiName,load_test.name AS performName from test_case left join api_test on
+        test_case.test_id=api_test.id left join load_test on test_case.test_id=load_test.id
         <where>
             <if test="request.testCaseIds!=null and request.testCaseIds.size() > 0">
                 and test_case.id in
@@ -198,4 +199,8 @@
             </if>
         </where>
     </select>
+
+    <select id="getMaxNumByProjectId" resultType="io.metersphere.base.domain.TestCase">
+        select * from test_case where test_case.project_id = #{projectId} order by num desc limit 1;
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -84,6 +84,7 @@ public class TestCaseService {
         testCase.setId(UUID.randomUUID().toString());
         testCase.setCreateTime(System.currentTimeMillis());
         testCase.setUpdateTime(System.currentTimeMillis());
+        testCase.setNum(getNextNum(testCase.getProjectId()));
         testCaseMapper.insert(testCase);
     }
 
@@ -253,9 +254,12 @@ public class TestCaseService {
         TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
         if (!testCases.isEmpty()) {
             AtomicInteger sort = new AtomicInteger();
+            AtomicInteger num = new AtomicInteger();
+            num.set(getNextNum(projectId)+testCases.size());
             testCases.forEach(testcase -> {
                 testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
                 testcase.setSort(sort.getAndIncrement());
+                testcase.setNum(num.decrementAndGet());
                 mapper.insert(testcase);
             });
         }
@@ -429,4 +433,17 @@ public class TestCaseService {
             MSException.throwException(Translator.get("related_case_del_fail_prefix") + " " + str + " " + Translator.get("related_case_del_fail_suffix"));
         }
     }
+
+    /**
+     * 获取项目下一个num (页面展示的ID)
+     * @return
+     */
+    private int getNextNum(String projectId) {
+        TestCase testCase = extTestCaseMapper.getMaxNumByProjectId(projectId);
+        if (testCase == null) {
+            return 100001;
+        } else {
+            return Optional.ofNullable(testCase.getNum()+1).orElse(100001);
+        }
+    }
 }

backend/src/main/resources/db/migration/V8__modify_test_case.sql

+alter table test_case add num int null comment 'Manually controlled growth identifier';
+
+DROP PROCEDURE IF EXISTS test_cursor;
+DELIMITER //
+CREATE PROCEDURE test_cursor()
+BEGIN
+    DECLARE projectId VARCHAR(64);
+    DECLARE caseId VARCHAR(64);
+    DECLARE num INT;
+    DECLARE done INT DEFAULT 0;
+    DECLARE cursor1 CURSOR FOR (SELECT DISTINCT project_id
+                                FROM test_case
+                                WHERE num IS NULL);
+    DECLARE cursor2 CURSOR FOR (SELECT id
+                                FROM test_case
+                                WHERE project_id = projectId
+                                ORDER BY create_time);
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+    OPEN cursor1;
+    outer_loop:
+    LOOP
+        FETCH cursor1 INTO projectId;
+        IF done
+        THEN
+            LEAVE outer_loop;
+        END IF;
+        SET num = 100001;
+        OPEN cursor2;
+        inner_loop:
+        LOOP
+            FETCH cursor2 INTO caseId;
+            IF done
+            THEN
+                LEAVE inner_loop;
+            END IF;
+            UPDATE test_case
+            SET num = num
+            WHERE id = caseId;
+            SET num = num + 1;
+        END LOOP;
+        SET done = 0;
+        CLOSE cursor2;
+    END LOOP;
+    CLOSE cursor1;
+END //
+DELIMITER ;
+
+CALL test_cursor();
+DROP PROCEDURE IF EXISTS test_cursor;
\ No newline at end of file

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

@@ -38,6 +38,11 @@
         class="test-content">
         <el-table-column
           type="selection"/>
+        <el-table-column
+          prop="num"
+          :label="$t('commons.id')"
+          show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -33,7 +33,11 @@
 
         <el-table-column
           type="selection"></el-table-column>
-
+        <el-table-column
+          prop="num"
+          :label="$t('commons.id')"
+          show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"

frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue

@@ -5,6 +5,11 @@
       <el-table
         row-key="id"
         :data="failureTestCases">
+        <el-table-column
+          prop="num"
+          :label="$t('commons.id')"
+          show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"

frontend/src/i18n/en-US.js

@@ -103,6 +103,7 @@ export default {
     input_login_username: 'Please input the user ID or email',
     input_name: 'Please enter name',
     formatErr: 'Format Error',
+    id: 'ID',
     date: {
       select_date: 'Select date',
       start_date: 'Start date',

frontend/src/i18n/zh-CN.js

@@ -103,6 +103,7 @@ export default {
     input_login_username: '请输入用户 ID 或 邮箱',
     input_name: '请输入名称',
     formatErr: '格式错误',
+    id: 'ID',
     date: {
       select_date: '选择日期',
       start_date: '开始日期',

frontend/src/i18n/zh-TW.js

@@ -101,6 +101,7 @@ export default {
     delete_confirm: '請輸入以下內容，確認刪除：',
     input_name: '請輸入名稱',
     formatErr: '格式錯誤',
+    id: 'ID',
     date: {
       select_date: '選擇日期',
       start_date: '開始日期',