fix(接口测试): 修复用例新增前后置步骤数据源切换错误问题

--bug=1012764 --user=赵勇 【接口测试】接口前后置sql添加后，再添加其他前后置操作，数据源会消失 https://www.tapd.cn/55049933/s/1148430

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

@@ -451,7 +451,6 @@ public class ApiDefinitionExecResultService {
             }
             saveResult.setType(type);
             saveResult.setStatus(status);
-            saveResult.setResourceId(item.getName());
             saveResult.setStartTime(item.getStartTime());
             saveResult.setEndTime(item.getEndTime());
 

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

@@ -350,7 +350,8 @@ public class ApiExecutionQueueService {
                 if (report == null) {
                     executionQueueDetailMapper.deleteByPrimaryKey(item.getId());
                 }
-                if (report != null && StringUtils.equalsAnyIgnoreCase(report.getStatus(), TestPlanReportStatus.RUNNING.name(), APITestStatus.Waiting.name())
+                // 这里只处理已经开始执行的队列如果 报告状态是 Waiting 表示还没开始暂不处理
+                if (report != null && StringUtils.equalsAnyIgnoreCase(report.getStatus(), TestPlanReportStatus.RUNNING.name())
                         && report.getUpdateTime() < timeout) {
                     report.setStatus(ScenarioStatus.Timeout.name());
                     apiScenarioReportMapper.updateByPrimaryKeySelective(report);

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

@@ -1632,10 +1632,10 @@ export default {
           this.sort();
           this.$nextTick(() => {
             this.cancelBatchProcessing();
+          });
           if (isRefresh) {
             this.reloadTree = getUUID();
           }
-          });
           // 记录初始化数据
           let v1 = {
             apiScenarioModuleId: this.currentScenario.apiScenarioModuleId,

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

@@ -291,7 +291,7 @@ export default {
       this.$emit('refreshModule');
     },
     setNewSource(environment, obj) {
-      if (environment.config && environment.config.databaseConfigs) {
+      if (environment.config && environment.config.databaseConfigs && environment.config.databaseConfigs.length > 0) {
         let dataSources = environment.config.databaseConfigs.filter(item => item.name === obj.targetDataSourceName);
         if (dataSources && dataSources.length > 0) {
           obj.dataSourceId = dataSources[0].id;

frontend/src/business/components/api/definition/components/step/JmxStep.vue

@@ -259,11 +259,14 @@ export default {
     setOwnEnvironment(scenarioDefinition) {
       for (let i in scenarioDefinition) {
         let typeArray = ["JDBCPostProcessor", "JDBCSampler", "JDBCPreProcessor"]
-        if (typeArray.indexOf(scenarioDefinition[i].type) !== -1) {
+        if (typeArray.indexOf(scenarioDefinition[i].type) !== -1
+          && this.request.environmentId && !scenarioDefinition[i].environmentId) {
           scenarioDefinition[i].environmentId = this.request.environmentId;
+          if (this.request.dataSourceId && !scenarioDefinition[i].dataSourceId) {
             scenarioDefinition[i].dataSourceId = this.request.dataSourceId;
           }
         }
+      }
     },
     filterNode(value, data) {
       if (data.type && value.indexOf(data.type) !== -1) {