From a1171c0a4adbf2ff47fc72a9f4baf2c780acaebe Mon Sep 17 00:00:00 2001
From: liangdaliang <liangdaliang@wondersoft.cn>
Date: Tue, 11 Mar 2025 16:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B6=E5=AD=90=E7=BC=96=E6=8E=92=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/test/test/domain/TestCaseStep.java    |  7 ++++++-
 .../test/service/impl/TestCaseStepServiceImpl.java | 14 +++++++++++++-
 .../resources/mapper/test/TestCaseStepMapper.xml   |  2 ++
 test-ui/src/views/test/case/detail/step.vue        |  6 +++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/test-test/src/main/java/com/test/test/domain/TestCaseStep.java b/test-test/src/main/java/com/test/test/domain/TestCaseStep.java
index 19a0291..0b9607a 100644
--- a/test-test/src/main/java/com/test/test/domain/TestCaseStep.java
+++ b/test-test/src/main/java/com/test/test/domain/TestCaseStep.java
@@ -1,10 +1,12 @@
 package com.test.test.domain;
 
+import com.test.common.annotation.Excel;
 import com.test.common.core.domain.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import com.test.common.annotation.Excel;
+
+import java.util.List;
 
 /**
  * 用例步骤对象 test_case_step
@@ -132,4 +134,7 @@ public class TestCaseStep extends BaseEntity {
 
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
+
+    /** 循环或轮询的子步骤列表 */
+    private List<TestCaseStep> childrenList;
 }
diff --git a/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java
index 97401a1..63573a4 100644
--- a/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java
+++ b/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java
@@ -46,7 +46,19 @@ public class TestCaseStepServiceImpl implements ITestCaseStepService {
      */
     @Override
     public List<TestCaseStep> selectTestCaseStepList(TestCaseStep testCaseStep) {
-        return testCaseStepMapper.selectTestCaseStepList(testCaseStep);
+        testCaseStep.setDelFlag("0");
+        List<TestCaseStep> caseStepParentList = testCaseStepMapper.selectTestCaseStepList(testCaseStep);
+        for (TestCaseStep testCaseStepParent : caseStepParentList) {
+            if (testCaseStepParent.getType() > 2) {
+                // 加载子步骤
+                TestCaseStep testCaseStepChild = new TestCaseStep();
+                testCaseStepChild.setDelFlag("0");
+                testCaseStepChild.setParentId(testCaseStepParent.getId());
+                List<TestCaseStep> caseStepChildrenList = testCaseStepMapper.selectTestCaseStepList(testCaseStepChild);
+                testCaseStepParent.setChildrenList(caseStepChildrenList);
+            }
+        }
+        return caseStepParentList;
     }
 
     /**
diff --git a/test-test/src/main/resources/mapper/test/TestCaseStepMapper.xml b/test-test/src/main/resources/mapper/test/TestCaseStepMapper.xml
index 6e45c1c..3a94f2d 100644
--- a/test-test/src/main/resources/mapper/test/TestCaseStepMapper.xml
+++ b/test-test/src/main/resources/mapper/test/TestCaseStepMapper.xml
@@ -75,6 +75,7 @@
         <include refid="selectTestCaseStepVo"/>
         <where>
             <if test="parentId != null ">and parent_id = #{parentId}</if>
+            <if test="parentId == null ">and parent_id is null</if>
             <if test="caseId != null ">and case_id = #{caseId}</if>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="stepNum != null ">and step_num = #{stepNum}</if>
@@ -98,6 +99,7 @@
             <if test="postScript != null  and postScript != ''">and post_script = #{postScript}</if>
             <if test="assignment != null  and assignment != ''">and assignment = #{assignment}</if>
             <if test="assertion != null  and assertion != ''">and assertion = #{assertion}</if>
+            <if test="delFlag != null">and del_flag = #{delFlag}</if>
         </where>
         ORDER BY step_num
     </select>
diff --git a/test-ui/src/views/test/case/detail/step.vue b/test-ui/src/views/test/case/detail/step.vue
index 3c22d80..9053559 100644
--- a/test-ui/src/views/test/case/detail/step.vue
+++ b/test-ui/src/views/test/case/detail/step.vue
@@ -17,15 +17,15 @@
           <el-button size="mini" plain type="warning" icon="el-icon-rank" circle style="margin-right: 12px" class="drag-handle"/>
           <el-tag effect="plain" style="width: 70px;text-align: center;margin-right: 12px;" class="drag-handle">{{ dict.type.step_type.findLast(t => t.value == item.type).label }}</el-tag>
           <el-tag v-if="item.name" effect="plain" style="width: 240px;text-align: center;margin-right: 12px;" type="info" class="drag-handle">{{ item.name }}</el-tag>
-          <el-tag v-if="item.datasourceId" effect="plain" style="width: 240px;text-align: center;margin-right: 12px;" type="info" class="drag-handle">{{ datasourceList.findLast(t => t.id === item.datasourceId).name }}</el-tag>
+          <el-tag v-if="item.datasourceId && item.type < 3" effect="plain" style="width: 240px;text-align: center;margin-right: 12px;" type="info" class="drag-handle">{{ datasourceList.findLast(t => t.id === item.datasourceId).name }}</el-tag>
           <el-tag v-if="item.requestUrl" effect="plain" style="text-align: center;margin-right: 12px;" type="success" class="drag-handle">{{ item.requestUrl }}</el-tag>
           <el-tag effect="plain" style="text-align: center;margin-right: 12px;" class="drag-handle">{{ index + 1 }}</el-tag>
         </template>
         <el-button size="mini" type="text" @click="handleDel(index)" style="float: right">删除</el-button>
         <page1 v-if="item.type == 1" :form="item" :hosts="hosts"/>
         <page2 v-if="item.type == 2" :form="item" :datasourceList="datasourceList"/>
-        <page3 v-if="item.type == 3" :form="item" :list="list" :hosts="hosts" :datasourceList="datasourceList"/>
-        <page4 v-if="item.type == 4" :form="item" :list="list" :hosts="hosts" :datasourceList="datasourceList"/>
+        <page3 v-if="item.type == 3" :form="item" :list="item.childrenList" :hosts="hosts" :datasourceList="datasourceList"/>
+        <page4 v-if="item.type == 4" :form="item" :list="item.childrenList" :hosts="hosts" :datasourceList="datasourceList"/>
       </el-collapse-item>
       </draggable>
     </el-collapse>