Merge branch 'master' of https://github.com/metersphere/metersphere

# Conflicts:
#	backend/src/main/java/io/metersphere/xpack

backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java

@@ -85,15 +85,15 @@ public class ApiAutomationController {
     }
 
     @PostMapping(value = "/run")
-    public void run(@RequestBody RunScenarioRequest request) {
+    public String run(@RequestBody RunScenarioRequest request) {
         request.setExecuteType(ExecuteType.Completed.name());
-        apiAutomationService.run(request);
+        return apiAutomationService.run(request);
     }
 
     @PostMapping(value = "/run/batch")
-    public void runBatch(@RequestBody RunScenarioRequest request) {
+    public String runBatch(@RequestBody RunScenarioRequest request) {
         request.setExecuteType(ExecuteType.Saved.name());
-        apiAutomationService.run(request);
+        return apiAutomationService.run(request);
     }
 
 

backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java

@@ -98,4 +98,9 @@ public class ApiTestCaseController {
     public void testPlanRelevance(@RequestBody ApiCaseRelevanceRequest request) {
         apiTestCaseService.relevanceByCase(request);
     }
+
+    @PostMapping(value = "/jenkins/run")
+    public String jenkinsRun(@RequestBody RunCaseRequest request) {
+        return apiTestCaseService.run(request);
+    }
 }

backend/src/main/java/io/metersphere/api/dto/definition/RunCaseRequest.java

@@ -0,0 +1,13 @@
+package io.metersphere.api.dto.definition;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class RunCaseRequest {
+
+    private String caseId;
+
+    private String reportId;
+}

backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java

@@ -275,6 +275,11 @@ public class Swagger2Parser extends ApiImportAbstractParser {
                 } else if (value instanceof RefProperty) {
                     RefProperty refProperty = (RefProperty) value;
                     String simpleRef = refProperty.getSimpleRef();
+                    if (refSet.contains(simpleRef)) {
+                        //避免嵌套死循环
+                        jsonObject.put(key, new JSONArray());
+                        return;
+                    }
                     refSet.add(simpleRef);
                     Model model = definitions.get(simpleRef);
                     jsonObject.put(key, getBodyParameters(model.getProperties(), refSet));

backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java

@@ -1,11 +1,17 @@
 package io.metersphere.api.service;
 
 import com.alibaba.fastjson.JSONObject;
-import io.metersphere.api.dto.automation.ApiScenarioDTO;
+import com.fasterxml.jackson.core.type.TypeReference;
-import io.metersphere.api.dto.automation.ApiScenarioRequest;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.ApiCaseBatchRequest;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.*;
-import io.metersphere.api.dto.ApiCaseBatchRequest;
+import io.metersphere.api.dto.definition.request.MsTestElement;
+import io.metersphere.api.dto.definition.request.MsTestPlan;
+import io.metersphere.api.dto.definition.request.MsThreadGroup;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionMapper;
 import io.metersphere.base.mapper.ApiTestCaseMapper;
@@ -14,6 +20,7 @@ import io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper;
 import io.metersphere.base.mapper.ext.ExtApiTestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
+import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.i18n.Translator;
@@ -21,11 +28,13 @@ import io.metersphere.service.FileService;
 import io.metersphere.service.QuotaService;
 import io.metersphere.service.UserService;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.collections.ListedHashTree;
 import org.aspectj.util.FileUtil;
-import org.python.antlr.ast.Str;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -57,6 +66,8 @@ public class ApiTestCaseService {
     private ExtApiDefinitionExecResultMapper extApiDefinitionExecResultMapper;
     @Resource
     private ApiDefinitionMapper apiDefinitionMapper;
+    @Resource
+    private JMeterService jMeterService;
 
     private static final String BODY_FILE_DIR = "/opt/metersphere/data/body";
 
@@ -271,7 +282,7 @@ public class ApiTestCaseService {
     }
 
     public void deleteBatch(List<String> ids) {
-        for (String testId:ids) {
+        for (String testId : ids) {
             extTestPlanTestCaseMapper.deleteByTestCaseID(testId);
         }
         ApiTestCaseExample example = new ApiTestCaseExample();
@@ -331,10 +342,10 @@ public class ApiTestCaseService {
         Date firstTime = startAndEndDateInWeek.get("firstTime");
         Date lastTime = startAndEndDateInWeek.get("lastTime");
 
-        if(firstTime==null || lastTime == null){
+        if (firstTime == null || lastTime == null) {
-            return  0;
+            return 0;
-        }else {
+        } else {
-            return extApiTestCaseMapper.countByProjectIDAndCreateInThisWeek(projectId,firstTime.getTime(),lastTime.getTime());
+            return extApiTestCaseMapper.countByProjectIDAndCreateInThisWeek(projectId, firstTime.getTime(), lastTime.getTime());
         }
     }
 
@@ -351,16 +362,16 @@ public class ApiTestCaseService {
 
     public void deleteBatchByParam(ApiTestBatchRequest request) {
         List<String> ids = request.getIds();
-        if(request.isSelectAllDate()){
+        if (request.isSelectAllDate()) {
-            ids = this.getAllApiCaseIdsByFontedSelect(request.getFilters(),request.getModuleIds(),request.getName(),request.getProjectId(),request.getProtocol(),request.getUnSelectIds(),request.getStatus());
+            ids = this.getAllApiCaseIdsByFontedSelect(request.getFilters(), request.getModuleIds(), request.getName(), request.getProjectId(), request.getProtocol(), request.getUnSelectIds(), request.getStatus());
         }
         this.deleteBatch(ids);
     }
 
     public void editApiBathByParam(ApiTestBatchRequest request) {
         List<String> ids = request.getIds();
-        if(request.isSelectAllDate()){
+        if (request.isSelectAllDate()) {
-            ids = this.getAllApiCaseIdsByFontedSelect(request.getFilters(),request.getModuleIds(),request.getName(),request.getProjectId(),request.getProtocol(),request.getUnSelectIds(),request.getStatus());
+            ids = this.getAllApiCaseIdsByFontedSelect(request.getFilters(), request.getModuleIds(), request.getName(), request.getProjectId(), request.getProtocol(), request.getUnSelectIds(), request.getStatus());
         }
         request.cleanSelectParam();
         ApiTestCaseExample apiDefinitionExample = new ApiTestCaseExample();
@@ -371,7 +382,7 @@ public class ApiTestCaseService {
         apiTestCaseMapper.updateByExampleSelective(apiDefinitionWithBLOBs, apiDefinitionExample);
     }
 
-    private List<String> getAllApiCaseIdsByFontedSelect(Map<String, List<String>> filters,List<String>moduleIds, String name, String projectId, String protocol,List<String> unSelectIds,String status) {
+    private List<String> getAllApiCaseIdsByFontedSelect(Map<String, List<String>> filters, List<String> moduleIds, String name, String projectId, String protocol, List<String> unSelectIds, String status) {
         ApiTestCaseRequest selectRequest = new ApiTestCaseRequest();
         selectRequest.setFilters(filters);
         selectRequest.setModuleIds(moduleIds);
@@ -383,6 +394,44 @@ public class ApiTestCaseService {
         List<ApiTestCaseResult> list = extApiTestCaseMapper.list(selectRequest);
         List<String> allIds = list.stream().map(ApiTestCaseResult::getId).collect(Collectors.toList());
         List<String> ids = allIds.stream().filter(id -> !unSelectIds.contains(id)).collect(Collectors.toList());
-        return  ids;
+        return ids;
     }
+
+    public String run(RunCaseRequest request) {
+        ApiTestCaseWithBLOBs testCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
+        // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
+        if (testCaseWithBLOBs != null && StringUtils.isNotEmpty(testCaseWithBLOBs.getRequest())) {
+            try {
+                ObjectMapper mapper = new ObjectMapper();
+                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                MsTestElement element = mapper.readValue(testCaseWithBLOBs.getRequest(), new TypeReference<MsTestElement>() {
+                });
+                // 测试计划
+                MsTestPlan testPlan = new MsTestPlan();
+                testPlan.setHashTree(new LinkedList<>());
+                HashTree jmeterHashTree = new ListedHashTree();
+
+                // 线程组
+                MsThreadGroup group = new MsThreadGroup();
+                group.setLabel(testCaseWithBLOBs.getName());
+                group.setName(testCaseWithBLOBs.getId());
+
+                LinkedList<MsTestElement> hashTrees = new LinkedList<>();
+                hashTrees.add(element);
+                group.setHashTree(hashTrees);
+                testPlan.getHashTree().add(group);
+
+                testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
+
+                String runMode = ApiRunMode.DELIMIT.name();
+                // 调用执行方法
+                jMeterService.runDefinition(request.getReportId(), jmeterHashTree, request.getReportId(), runMode);
+
+            } catch (Exception ex) {
+                LogUtil.error(ex.getMessage());
+            }
+        }
+        return request.getReportId();
+    }
+
 }

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

@@ -297,20 +297,9 @@
     </select>
 
     <select id="listRelevance" resultType="io.metersphere.api.dto.definition.ApiDefinitionResult">
-        select api_definition.id, api_definition.project_id, api_definition.num,
+        select
-            api_definition.name,api_definition.protocol,api_definition.path,api_definition.module_id,api_definition.module_path,api_definition.method,
+        <include refid="io.metersphere.base.mapper.ApiDefinitionMapper.Base_Column_List"/>
-            api_definition.description,api_definition.request,api_definition.response,api_definition.environment_id,
-            api_definition.status, api_definition.user_id, api_definition.create_time, api_definition.update_time
         from api_definition
-        inner join
-          api_test_case c
-          on c.api_definition_id = api_definition.id
-          and not exists (
-            select id
-            from test_plan_api_case t
-            where t.api_case_id = c.id
-            and t.test_plan_id = #{request.planId}
-          )
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -346,6 +335,17 @@
                     #{value}
                 </foreach>
             </if>
+            and exists (
+                select id
+                from api_test_case c
+                where c.api_definition_id = api_definition.id
+                and not exists (
+                    select id
+                    from test_plan_api_case t
+                    where t.api_case_id = c.id
+                    and t.test_plan_id = #{request.planId}
+                )
+            )
         </where>
         <if test="request.orders != null and request.orders.size() > 0">
             order by

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

@@ -333,6 +333,13 @@
                 and project_id= #{request.projectId}
             </if>
         </where>
+        UNION ALL
+        select id,name,status,project_id,"scenario" as type from api_scenario
+        <where>
+            <if test="request.projectId!=null">
+                and project_id= #{request.projectId}
+            </if>
+        </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

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

@@ -15,4 +15,6 @@ public interface ExtTestPlanApiCaseMapper {
     List<String> getExecResultByPlanId(String planId);
 
     List<String> getIdsByPlanId(String planId);
+
+    List<String> getNotRelevanceCaseIds(@Param("planId")String planId, @Param("relevanceProjectIds")List<String> relevanceProjectIds);
 }

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

@@ -90,17 +90,31 @@
       </foreach>
     </if>
   </select>
-    <select id="getExecResultByPlanId" resultType="java.lang.String">
+  <select id="getExecResultByPlanId" resultType="java.lang.String">
-      select status
+    select status
-      from
+    from
-      test_plan_api_case
+    test_plan_api_case
-      where test_plan_id = #{planId}
+    where test_plan_id = #{planId}
-    </select>
+  </select>
 
-    <select id="getIdsByPlanId" resultType="java.lang.String">
+  <select id="getIdsByPlanId" resultType="java.lang.String">
-      select id from
+    select id
-      from test_plan_api_case
+    from test_plan_api_case
-      where id = #{planId}
+    where id = #{planId}
-    </select>
+  </select>
+
+  <select id="getNotRelevanceCaseIds" resultType="java.lang.String">
+    select t.id
+    from test_plan_api_case t
+    inner join api_test_case c
+      on c.id = t.api_case_id
+      <if test="relevanceProjectIds != null and relevanceProjectIds.size() > 0">
+        and c.project_id not in
+        <foreach collection="relevanceProjectIds" item="projectId" separator="," open="(" close=")">
+          #{projectId}
+        </foreach>
+      </if>
+    where t.test_plan_id = #{planId}
+  </select>
 
 </mapper>

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

@@ -21,4 +21,6 @@ public interface ExtTestPlanScenarioCaseMapper {
     List<String> getExecResultByPlanId(String planId);
 
     List<String> getIdsByPlanId(String planId);
+
+    List<String> getNotRelevanceCaseIds(String planId, List<String> relevanceProjectIds);
 }

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

@@ -92,4 +92,18 @@
       where test_plan_id = #{planId}
     </select>
 
+    <select id="getNotRelevanceCaseIds" resultType="java.lang.String">
+      select t.id
+      from test_plan_api_scenario t
+      inner join api_scenario c
+      on c.id = t.api_scenario_id
+      <if test="relevanceProjectIds != null and relevanceProjectIds.size() > 0">
+        and c.project_id not in
+        <foreach collection="relevanceProjectIds" item="projectId" separator="," open="(" close=")">
+          #{projectId}
+        </foreach>
+      </if>
+      where t.test_plan_id = #{planId}
+    </select>
+
 </mapper>

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

@@ -15,6 +15,8 @@ public interface ExtTestPlanTestCaseMapper {
 
     List<TestPlanCaseDTO> list(@Param("request") QueryTestPlanCaseRequest request);
 
+    List<TestPlanCaseDTO> listByPlanId(@Param("request") QueryTestPlanCaseRequest request);
+
     List<TestPlanCaseDTO> listByNode(@Param("request") QueryTestPlanCaseRequest request);
 
     List<TestPlanCaseDTO> listByNodes(@Param("request") QueryTestPlanCaseRequest request);

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

@@ -334,6 +334,34 @@
       test_plan_test_case
       where plan_id = #{planId}
     </select>
+    <select id="listByPlanId" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
+        SELECT test_plan_api_case.api_case_id as id,"definition" as type,api_test_case.name,test_plan_api_case.status
+        from test_plan_api_case left join  api_test_case  on test_plan_api_case.api_case_id=api_test_case.id
+        <where>
+            <if test="request.planId != null">
+                and test_plan_api_case.test_plan_id = #{request.planId}
+            </if>
+        </where>
+        UNION ALL
+        SELECT test_plan_api_scenario.api_scenario_id as id,"scenario" as type,api_scenario.name,test_plan_api_scenario.status
+        from test_plan_api_scenario  left join api_scenario on test_plan_api_scenario.api_scenario_id=api_scenario.id
+        <where>
+            <if test="request.planId != null">
+                and test_plan_api_scenario.test_plan_id = #{request.planId}
+            </if>
+        </where>
+        UNION ALL
+        SELECT test_case.test_id as id,test_case.type as type,test_case.name,test_plan_test_case.status
+        from test_plan_test_case  left join  test_case  on test_plan_test_case.case_id =test_case.id
+        <where>
+            <if test="request.planId != null">
+                and test_plan_test_case.plan_id = #{request.planId}
+            </if>
+            <if test="request.method != null">
+                and test_case.method = #{request.method}
+            </if>
+        </where>
+    </select>
 
     <update id="updateTestCaseStates" parameterType="java.lang.String">
         update test_plan_test_case

backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java

@@ -1,5 +1,5 @@
 package io.metersphere.commons.constants;
 
 public enum ApiRunMode {
-    RUN, DEBUG,DELIMIT,SCENARIO, API_PLAN, SCENARIO_PLAN
+    RUN, DEBUG,DELIMIT,SCENARIO, API_PLAN, SCENARIO_PLAN,API
 }

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

@@ -57,7 +57,7 @@ public class TestCaseController {
         return testCaseService.listTestCase(request);
     }
 
-
+   /*jenkins项目下所有接口和性能测试用例*/
     @GetMapping("/list/method/{projectId}")
     public List<TestCaseDTO> listByMethod(@PathVariable String projectId) {
         QueryTestCaseRequest request = new QueryTestCaseRequest();

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

@@ -30,13 +30,13 @@ public class TestPlanTestCaseController {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, testPlanTestCaseService.list(request));
     }
-
+   /*jenkins测试计划下全部用例*/
     @GetMapping("/list/{planId}")
     public List<TestPlanCaseDTO> getTestPlanCaseByPlanId(@PathVariable String planId) {
         QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
         request.setPlanId(planId);
         request.setMethod("auto");
-        return testPlanTestCaseService.list(request);
+        return testPlanTestCaseService.listByPlanId(request);
     }
 
     @GetMapping("/list/node/{planId}/{nodePaths}")

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

@@ -77,6 +77,9 @@ public class TestPlanApiCaseService {
     }
 
     public void deleteApiCaseBath(TestPlanApiCaseBatchRequest request) {
+        if (CollectionUtils.isEmpty(request.getIds())) {
+            return;
+        }
         apiDefinitionExecResultService.deleteByResourceIds(request.getIds());
         TestPlanApiCaseExample example = new TestPlanApiCaseExample();
         example.createCriteria()
@@ -97,4 +100,11 @@ public class TestPlanApiCaseService {
         apiCase.setStatus(status);
         testPlanApiCaseMapper.updateByPrimaryKeySelective(apiCase);
     }
+
+    public void deleteByRelevanceProjectIds(String planId, List<String> relevanceProjectIds) {
+        TestPlanApiCaseBatchRequest request = new TestPlanApiCaseBatchRequest();
+        request.setPlanId(planId);
+        request.setIds(extTestPlanApiCaseMapper.getNotRelevanceCaseIds(planId, relevanceProjectIds));
+        deleteApiCaseBath(request);
+    }
 }

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

@@ -73,6 +73,9 @@ public class TestPlanScenarioCaseService {
     }
 
     public void deleteApiCaseBath(TestPlanApiCaseBatchRequest request) {
+        if (CollectionUtils.isEmpty(request.getIds())) {
+            return;
+        }
         TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
         example.createCriteria()
                 .andIdIn(request.getIds());
@@ -110,4 +113,11 @@ public class TestPlanScenarioCaseService {
         request.setIds(ids);
         deleteApiCaseBath(request);
     }
+
+    public void deleteByRelevanceProjectIds(String planId, List<String> relevanceProjectIds) {
+        TestPlanApiCaseBatchRequest request = new TestPlanApiCaseBatchRequest();
+        request.setIds(extTestPlanScenarioCaseMapper.getNotRelevanceCaseIds(planId, relevanceProjectIds));
+        request.setPlanId(planId);
+        deleteApiCaseBath(request);
+    }
 }

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

@@ -10,7 +10,6 @@ import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
-import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
@@ -27,7 +26,6 @@ import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.SystemParameterService;
 import io.metersphere.track.Factory.ReportComponentFactory;
 import io.metersphere.track.domain.ReportComponent;
-
 import io.metersphere.track.dto.TestCaseReportMetricDTO;
 import io.metersphere.track.dto.TestPlanCaseDTO;
 import io.metersphere.track.dto.TestPlanDTO;
@@ -69,8 +67,6 @@ public class TestPlanService {
     @Resource
     TestPlanTestCaseService testPlanTestCaseService;
     @Resource
-    ExtProjectMapper extProjectMapper;
-    @Resource
     TestCaseReportMapper testCaseReportMapper;
     @Resource
     TestPlanProjectMapper testPlanProjectMapper;
@@ -229,6 +225,14 @@ public class TestPlanService {
                 criteria.andCaseIdNotIn(caseIds);
             }
             testPlanTestCaseMapper.deleteByExample(testPlanTestCaseExample);
+
+            List<String> relevanceProjectIds = new ArrayList<>();
+            relevanceProjectIds.add(testPlan.getProjectId());
+            if (!CollectionUtils.isEmpty(testPlan.getProjectIds())) {
+                relevanceProjectIds.addAll(testPlan.getProjectIds());
+            }
+            testPlanApiCaseService.deleteByRelevanceProjectIds(testPlan.getId(), relevanceProjectIds);
+            testPlanScenarioCaseService.deleteByRelevanceProjectIds(testPlan.getId(), relevanceProjectIds);
         }
     }
 

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

@@ -55,6 +55,11 @@ public class TestPlanTestCaseService {
         });
         return list;
     }
+    public List<TestPlanCaseDTO> listByPlanId(QueryTestPlanCaseRequest request) {
+        List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.listByPlanId(request);
+
+        return list;
+    }
 
     public List<TestPlanCaseDTO> listByNode(QueryTestPlanCaseRequest request) {
         List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.listByNode(request);

frontend/src/business/components/api/automation/report/ApiReportList.vue

@@ -108,7 +108,7 @@ export default {
       tableData: [],
       multipleSelection: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       loading: false,
       currentProjectId: "",

frontend/src/business/components/api/automation/scenario/ApiComponent.vue

@@ -56,10 +56,10 @@
             </el-input>
           </div>
           <p class="tip">{{$t('api_test.definition.request.req_param')}} </p>
-          <ms-api-request-form :referenced="true" :headers="request.headers " :request="request" v-if="request.protocol==='HTTP'"/>
+          <ms-api-request-form :referenced="true" :headers="request.headers " :request="request" v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"/>
-          <ms-tcp-basis-parameters :request="request" v-if="request.protocol==='TCP'"/>
+          <ms-tcp-basis-parameters :request="request" v-if="request.protocol==='TCP'|| request.type==='TCPSampler'"/>
-          <ms-sql-basis-parameters :request="request" v-if="request.protocol==='SQL'"/>
+          <ms-sql-basis-parameters :request="request" v-if="request.protocol==='SQL'|| request.type==='JDBCSampler'"/>
-          <ms-dubbo-basis-parameters :request="request" v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'"/>
+          <ms-dubbo-basis-parameters :request="request" v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'|| request.type==='DubboSampler'"/>
 
           <p class="tip">{{$t('api_test.definition.request.res_param')}} </p>
           <ms-request-result-tail :response="request.requestResult" ref="runResult"/>

frontend/src/business/components/api/automation/scenario/EditApiScenario.vue

@@ -623,12 +623,19 @@
         this.$refs.tag.open();
       },
       remove(row, node) {
-        const parent = node.parent
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
-        const hashTree = parent.data.hashTree || parent.data;
+          confirmButtonText: this.$t('commons.confirm'),
-        const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
+          callback: (action) => {
-        hashTree.splice(index, 1);
+            if (action === 'confirm') {
-        this.sort();
+              const parent = node.parent
-        this.reload();
+              const hashTree = parent.data.hashTree || parent.data;
+              const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
+              hashTree.splice(index, 1);
+              this.sort();
+              this.reload();
+            }
+          }
+        });
       }
       ,
       copyRow(row, node) {

frontend/src/business/components/api/definition/components/basis/BatchEdit.vue

@@ -78,7 +78,7 @@
       },
       open() {
         this.dialogVisible = true;
-        this.size = this.$parent.selectRows.size;
+        this.size = this.$parent.selectDataCounts;
         listenGoBack(this.handleClose);
       },
       handleClose() {

frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue

@@ -140,10 +140,18 @@
       methods: {
 
         deleteCase(index, row) {
-          this.$get('/api/testcase/delete/' + row.id, () => {
+          this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
-            this.$success(this.$t('commons.delete_success'));
+            confirmButtonText: this.$t('commons.confirm'),
-            this.$emit('refresh');
+            callback: (action) => {
+              if (action === 'confirm') {
+                this.$get('/api/testcase/delete/' + row.id, () => {
+                  this.$success(this.$t('commons.delete_success'));
+                  this.$emit('refresh');
+                });
+              }
+            }
           });
+
         },
         singleRun(data) {
           this.$emit('singleRun', data);

frontend/src/business/components/api/definition/components/list/ApiList.vue

@@ -9,24 +9,18 @@
       <el-table v-loading="result.loading"
                 ref="apiDefinitionTable"
                 border
-                :data="tableData" row-key="id" class="test-content adjust-table"
+                :data="tableData" row-key="id" class="test-content adjust-table ms-select-all"
                 @select-all="handleSelectAll"
                 @select="handleSelect" :height="screenHeight">
-        <el-table-column type="selection"/>
+        <el-table-column width="50" type="selection"/>
-        <el-table-column width="40" :resizable="false" align="center">
+
-          <el-dropdown slot="header" style="width: 14px">
+        <ms-table-select-all
-            <span class="el-dropdown-link" style="width: 14px">
+          :page-size="pageSize"
-              <i class="el-icon-arrow-down el-icon--right" style="margin-left: 0px"></i>
+          :total="total"
-            </span>
+          @selectPageAll="isSelectDataAll(false)"
-            <el-dropdown-menu slot="dropdown">
+          @selectAll="isSelectDataAll(true)"/>
-              <el-dropdown-item @click.native.stop="isSelectDataAll(true)">
+
-                {{$t('api_test.batch_menus.select_all_data',[total])}}
+        <el-table-column width="30" :resizable="false" align="center">
-              </el-dropdown-item>
-              <el-dropdown-item @click.native.stop="isSelectDataAll(false)">
-                {{$t('api_test.batch_menus.select_show_data',[tableData.length])}}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
           <template v-slot:default="scope">
             <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
           </template>
@@ -126,10 +120,12 @@
   import {getCurrentProjectID} from "@/common/js/utils";
   import {WORKSPACE_ID} from '../../../../../../common/js/constants';
   import ApiListContainer from "./ApiListContainer";
+  import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
 
   export default {
     name: "ApiList",
     components: {
+      MsTableSelectAll,
       ApiListContainer,
       MsTableButton,
       MsTableOperatorButton,
@@ -466,7 +462,6 @@
   .search-input {
     float: right;
     width: 300px;
-    /*margin-bottom: 20px;*/
     margin-right: 20px;
   }
 

frontend/src/business/components/api/head/ApiHeaderMenus.vue

@@ -97,7 +97,6 @@ export default {
   methods: {
     registerEvents() {
       ApiEvent.$on(LIST_CHANGE, () => {
-        // // todo 这里偶尔会有 refs 为空的情况
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
@@ -111,6 +110,9 @@ export default {
   },
   mounted() {
     this.registerEvents();
+  },
+  beforeDestroy() {
+    ApiEvent.$off(LIST_CHANGE);
   }
 }
 

frontend/src/business/components/api/report/ApiReportList.vue

@@ -85,7 +85,7 @@ export default {
       tableData: [],
       multipleSelection: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       loading: false,
       statusFilters: [

frontend/src/business/components/api/test/ApiReportDialog.vue

@@ -45,7 +45,7 @@ export default {
       tableData: [],
       loading: false,
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
     }
   },

frontend/src/business/components/api/test/ApiTestList.vue

@@ -90,7 +90,7 @@
         tableData: [],
         multipleSelection: [],
         currentPage: 1,
-        pageSize: 5,
+        pageSize: 10,
         total: 0,
         loading: false,
         selectIds: new Set(),

frontend/src/business/components/api/test/components/ApiScenarioSelect.vue

@@ -63,7 +63,7 @@ export default {
       },
       tableData: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       selection: false,
       environmentMap: new Map()

frontend/src/business/components/common/components/table/MsTableSelectAll.vue

@@ -0,0 +1,28 @@
+<template>
+  <el-table-column width="1" :resizable="false" align="center">
+    <el-dropdown slot="header">
+            <span class="el-dropdown-link">
+              <i class="el-icon-arrow-down"></i>
+            </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item @click.native.stop="$emit('selectAll')">
+          {{$t('api_test.batch_menus.select_all_data',[total])}}
+        </el-dropdown-item>
+        <el-dropdown-item @click.native.stop="$emit('selectPageAll')">
+          {{$t('api_test.batch_menus.select_show_data',[pageSize])}}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </el-table-column>
+</template>
+
+<script>
+    export default {
+      name: "MsTableSelectAll",
+      props: ['total', 'pageSize']
+    }
+</script>
+
+<style scoped>
+
+</style>

frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue

@@ -84,7 +84,6 @@ export default {
   methods: {
     registerEvents() {
       PerformanceEvent.$on(LIST_CHANGE, () => {
-        // // todo 这里偶尔会有 refs 为空的情况
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
@@ -92,6 +91,9 @@ export default {
   },
   mounted() {
     this.registerEvents();
+  },
+  beforeDestroy() {
+    PerformanceEvent.$off(LIST_CHANGE);
   }
 }
 

frontend/src/business/components/performance/report/PerformanceTestReport.vue

@@ -128,7 +128,7 @@ export default {
       tableData: [],
       multipleSelection: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       loading: false,
       testId: null,

frontend/src/business/components/performance/test/PerformanceTestList.vue

@@ -108,7 +108,7 @@ export default {
       tableData: [],
       multipleSelection: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       loading: false,
       testId: null,

frontend/src/business/components/settings/organization/OrganizationMember.vue

@@ -143,7 +143,7 @@
         },
         multipleSelection: [],
         currentPage: 1,
-        pageSize: 5,
+        pageSize: 10,
         total: 0,
         options: [],
         loading: false,

frontend/src/business/components/settings/organization/OrganizationWorkspace.vue

@@ -458,10 +458,10 @@
         items: [],
         userList: [],
         currentPage: 1,
-        pageSize: 5,
+        pageSize: 10,
         total: 0,
         dialogCurrentPage: 1,
-        dialogPageSize: 5,
+        dialogPageSize: 10,
         dialogTotal: 0,
         memberLineData: [],
         memberForm: {},

frontend/src/business/components/settings/project/MsProject.vue

@@ -120,7 +120,7 @@ export default {
       zentao: false,
       form: {},
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       rules: {
         name: [

frontend/src/business/components/settings/system/Organization.vue

@@ -218,10 +218,10 @@ export default {
       dialogOrgMemberUpdateVisible: false,
       multipleSelection: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       dialogCurrentPage: 1,
-      dialogPageSize: 5,
+      dialogPageSize: 10,
       dialogTotal: 0,
       currentRow: {},
       condition: {},

frontend/src/business/components/settings/system/SystemWorkspace.vue

@@ -487,10 +487,10 @@
         dialogCondition: {},
         items: [],
         currentPage: 1,
-        pageSize: 5,
+        pageSize: 10,
         total: 0,
         dialogCurrentPage: 1,
-        dialogPageSize: 5,
+        dialogPageSize: 10,
         dialogTotal: 0,
         memberLineData: [],
         memberForm: {},

frontend/src/business/components/settings/system/TestResourcePool.vue

@@ -177,7 +177,7 @@ export default {
       condition: {},
       items: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       form: {},
       requiredRules: [{required: true, message: this.$t('test_resource_pool.fill_the_data'), trigger: 'blur'}],

frontend/src/business/components/settings/system/User.vue

@@ -367,7 +367,7 @@ export default {
       multipleSelection: [],
       userRole: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       condition: {},
       tableData: [],

frontend/src/business/components/settings/workspace/WorkspaceMember.vue

@@ -133,7 +133,7 @@
         },
         multipleSelection: [],
         currentPage: 1,
-        pageSize: 5,
+        pageSize: 10,
         total: 0,
       }
     },

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

@@ -66,9 +66,6 @@ export default {
   data() {
     return {
       result: {},
-      currentPage: 1,
-      pageSize: 5,
-      total: 0,
       projects: [],
       treeNodes: [],
       selectNodeIds: [],

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

@@ -62,7 +62,7 @@ export default {
       id: '',
       condition: {},
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       url: '',
       type: ''

frontend/src/business/components/track/head/TrackHeaderMenus.vue

@@ -131,11 +131,13 @@ export default {
     },
     registerEvents() {
       TrackEvent.$on(LIST_CHANGE, () => {
-        // // todo 这里偶尔会有 refs 为空的情况
         this.$refs.planRecent.recent();
         this.$refs.caseRecent.recent();
       });
     }
+  },
+  beforeDestroy() {
+    TrackEvent.$off(LIST_CHANGE);
   }
 }
 

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 7d43154a7c19732407a8e9ace8a7d1ea13c91f36
+Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433

frontend/src/common/css/main.css

@@ -120,7 +120,6 @@ html,body {
   padding-right: 60px;
 }
 
-
 /* 滚动条样式 */
 ::-webkit-scrollbar{
   width: 5px;
@@ -137,3 +136,36 @@ html,body {
   background-color: transparent;
   position: fixed;
 }
+
+/* <-- 表格全选样式 */
+.ms-select-all th:first-child {
+  border: 1px solid #DCDFE6;
+  border-radius:5px;
+  padding: 0px;
+  margin-top: 5px;
+  display: inline-block;
+  margin-top: 25px;
+  width: 50px;
+}
+
+.ms-select-all th:nth-child(2) {
+  overflow: visible;
+}
+
+.ms-select-all th:first-child>.cell {
+  padding: 5px;
+  width: 35px;
+}
+
+.ms-select-all th:nth-child(2)>.cell {
+  overflow: visible;
+}
+
+.ms-select-all .el-icon-arrow-down {
+  position: absolute;
+  display: inline-block;
+  top: -3px;
+  left: -40px;
+  width: 30px;
+}
+/* 表格全选样式 --> */