fix(场景自动化): 修复添加自定义请求问题，场景变量查看问题

backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java

@@ -32,6 +32,7 @@ import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.commons.constants.LoopConstants;
 import io.metersphere.commons.constants.MsTestElementConstants;
+import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.FileUtils;
 import io.metersphere.commons.utils.LogUtil;
@@ -48,6 +49,7 @@ import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -211,6 +213,9 @@ public abstract class MsTestElement {
                     csvDataSet.setName(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName());
                     csvDataSet.setProperty("fileEncoding", StringUtils.isEmpty(item.getEncoding()) ? "UTF-8" : item.getEncoding());
                     if (CollectionUtils.isNotEmpty(item.getFiles())) {
+                        if (new File(BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName()).exists()) {
+                            MSException.throwException(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName() + "：[ CSV文件不存在 ]");
+                        }
                         csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName());
                     }
                     csvDataSet.setIgnoreFirstLine(false);

backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java

@@ -3,11 +3,14 @@ package io.metersphere.api.dto.definition.request.unknown;
 import com.alibaba.fastjson.annotation.JSONType;
 import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.FileUtils;
 import io.metersphere.commons.utils.LogUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.config.CSVDataSet;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
@@ -15,6 +18,7 @@ import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jorphan.collections.HashTree;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
 import java.util.List;
 
@@ -53,6 +57,13 @@ public class MsJmeterElement extends MsTestElement {
                 if (!config.isOperating() && scriptWrapper instanceof ThreadGroup && !((ThreadGroup) scriptWrapper).isEnabled()) {
                     LogUtil.info(((ThreadGroup) scriptWrapper).getName() + "是被禁用线程组不加入执行");
                 } else {
+                    // CSV数据检查文件路径是否还存在
+                    if (scriptWrapper instanceof CSVDataSet) {
+                        String path = ((CSVDataSet) scriptWrapper).getPropertyAsString("filename");
+                        if (!new File(path).exists()) {
+                            MSException.throwException(StringUtils.isEmpty(((CSVDataSet) scriptWrapper).getName()) ? "CSVDataSet" : ((CSVDataSet) scriptWrapper).getName() + "：[ CSV文件不存在 ]");
+                        }
+                    }
                     if (CollectionUtils.isNotEmpty(hashTree)) {
                         for (MsTestElement el : hashTree) {
                             el.toHashTree(elementTree, el.getHashTree(), config);
@@ -62,6 +73,7 @@ public class MsJmeterElement extends MsTestElement {
             }
         } catch (Exception ex) {
             ex.printStackTrace();
+            MSException.throwException(ex.getMessage());
         }
     }
 

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

@@ -535,8 +535,12 @@ public class ApiAutomationService {
             }
 
             // 生成报告和HashTree
-            HashTree hashTree = generateHashTree(item, reportId, planEnvMap);
+            HashTree hashTree = null;
-
+            try {
+                hashTree = generateHashTree(item, reportId, planEnvMap);
+            } catch (Exception ex) {
+                MSException.throwException(ex.getMessage());
+            }
             //存储报告
             batchMapper.insert(report);
 
@@ -602,7 +606,12 @@ public class ApiAutomationService {
         }
         ParameterConfig config = new ParameterConfig();
         config.setConfig(envConfig);
-        HashTree hashTree = request.getTestElement().generateHashTree(config);
+        HashTree hashTree = null;
+        try {
+            hashTree = request.getTestElement().generateHashTree(config);
+        } catch (Exception e) {
+            MSException.throwException(e.getMessage());
+        }
         // 调用执行方法
         APIScenarioReportResult reportResult = createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
                 SessionUtils.getUserId());

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

@@ -69,7 +69,7 @@
           <el-table-column v-if="item.id == 'tags'" prop="tags" min-width="120px"
                            :label="$t('api_test.automation.tag')" :key="index">
             <template v-slot:default="scope">
-              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" style="margin-left: 5px"/>
+              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" :show-tooltip="true" tooltip style="margin-left: 5px"/>
             </template>
           </el-table-column>
           <el-table-column v-if="item.id == 'userId'" prop="userId" min-width="120px"
@@ -758,7 +758,6 @@
     z-index: auto !important;
   }
 
-
   /deep/ .el-table__fixed-right {
     height: 100% !important;
   }

frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue

@@ -28,10 +28,10 @@
       <div class="header-right" @click.stop>
         <slot name="message"></slot>
         <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="showBtn">
-          <el-switch v-model="data.enable" class="enable-switch" size="mini"/>
+          <el-switch v-model="data.enable" class="enable-switch" size="mini" :disabled="data.disabled"/>
         </el-tooltip>
         <slot name="button"></slot>
-        <step-extend-btns style="display: contents" :data="data" @copy="copyRow" @remove="remove" @openScenario="openScenario" v-if="showBtn"/>
+        <step-extend-btns style="display: contents" :data="data" @copy="copyRow" @remove="remove" @openScenario="openScenario" v-if="showBtn && !data.disabled"/>
       </div>
 
     </div>

frontend/src/business/components/api/automation/scenario/variable/VariableList.vue

@@ -219,8 +219,12 @@
         return this.selection.includes(row.id)
       },
       open: function (variables, headers, disabled) {
+        if(variables){
           this.variables = variables;
+        }
+        if(headers){
           this.headers = headers;
+        }
         this.visible = true;
         this.editData = {type: "CONSTANT"};
         this.addParameters(this.editData);

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

@@ -45,7 +45,7 @@
               <span style="cursor:pointer" v-if="isReadOnly"> {{ scope.row.num }} </span>
               <el-tooltip v-else content="编辑">
                 <a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>
-              </el-tooltip >
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column
@@ -116,7 +116,7 @@
             min-width="120px"
             :key="index">
             <template v-slot:default="scope">
-              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" style="margin-left: 5px"/>
+              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName" style="margin-left: 5px"/>
             </template>
           </el-table-column>
 
@@ -211,42 +211,42 @@
 
 <script>
 
-import MsTableHeader from '../../../../common/components/MsTableHeader';
+  import MsTableHeader from '../../../../common/components/MsTableHeader';
-import MsTableOperator from "../../../../common/components/MsTableOperator";
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
-import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-import MsTableButton from "../../../../common/components/MsTableButton";
+  import MsTableButton from "../../../../common/components/MsTableButton";
-import MsTablePagination from "../../../../common/pagination/TablePagination";
+  import MsTablePagination from "../../../../common/pagination/TablePagination";
-import MsTag from "../../../../common/components/MsTag";
+  import MsTag from "../../../../common/components/MsTag";
-import MsApiCaseList from "../case/ApiCaseList";
+  import MsApiCaseList from "../case/ApiCaseList";
-import MsContainer from "../../../../common/components/MsContainer";
+  import MsContainer from "../../../../common/components/MsContainer";
-import MsBottomContainer from "../BottomContainer";
+  import MsBottomContainer from "../BottomContainer";
-import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-import MsBatchEdit from "../basis/BatchEdit";
+  import MsBatchEdit from "../basis/BatchEdit";
-import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
+  import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
-import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
+  import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
-import {PROJECT_NAME} from '@/common/js/constants';
+  import {PROJECT_NAME} from '@/common/js/constants';
-import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
+  import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
-import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
+  import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
-import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
+  import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
-import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
+  import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
-import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
+  import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
-import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
+  import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
-import MsTipButton from "@/business/components/common/components/MsTipButton";
+  import MsTipButton from "@/business/components/common/components/MsTipButton";
-import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
+  import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
-import {
+  import {
     _handleSelect,
     _handleSelectAll, buildBatchParam, getLabel,
     getSelectDataCounts, initCondition,
     setUnSelectIds, toggleAllSelection
-} from "@/common/js/tableUtils";
+  } from "@/common/js/tableUtils";
-import {_filter, _sort} from "@/common/js/tableUtils";
+  import {_filter, _sort} from "@/common/js/tableUtils";
-import {Api_List} from "@/business/components/common/model/JsonData";
+  import {Api_List} from "@/business/components/common/model/JsonData";
-import HeaderCustom from "@/business/components/common/head/HeaderCustom";
+  import HeaderCustom from "@/business/components/common/head/HeaderCustom";
-import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
+  import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
-import {Body} from "@/business/components/api/definition/model/ApiTestModel";
+  import {Body} from "@/business/components/api/definition/model/ApiTestModel";
 
 
-export default {
+  export default {
     name: "ApiList",
     components: {
       HeaderLabelOperate,
@@ -334,7 +334,7 @@ export default {
       currentProtocol: String,
       selectNodeIds: Array,
       isSelectThisWeek: String,
-    activeDom:String,
+      activeDom: String,
       visible: {
         type: Boolean,
         default: false,
@@ -626,7 +626,7 @@ export default {
         let ids = arr.map(row => row.id);
         param.ids = ids;
         param.projectId = getCurrentProjectID();
-      param.moduleId=param.nodeId;
+        param.moduleId = param.nodeId;
         param.condition = this.condition;
         param.selectAllDate = this.isSelectAllDate;
         param.unSelectIds = this.unSelection;
@@ -709,7 +709,7 @@ export default {
         }
         this.result = this.$post("/api/definition/export/" + type, param, response => {
           let obj = response.data;
-        if(type == 'MS') {
+          if (type == 'MS') {
             obj.protocol = this.currentProtocol;
             this.buildApiPath(obj.data);
             downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
@@ -752,7 +752,7 @@ export default {
         this.$refs.searchBar.open();
       }
     },
-}
+  }
 </script>
 
 <style scoped>

frontend/src/business/components/common/components/MsTag.vue

@@ -1,5 +1,9 @@
 <template>
+  <el-tooltip placement="top" v-if="showTooltip">
+    <div slot="content">{{content}}</div>
     <el-tag :type="type" :effect="effect" :color="color" size="mini">{{content}}</el-tag>
+  </el-tooltip>
+  <el-tag :type="type" :effect="effect" :color="color" size="mini" v-else>{{content}}</el-tag>
 </template>
 
 <script>
@@ -20,6 +24,10 @@
       effect: {
         type: String,
         default: 'dark',
+      },
+      showTooltip: {
+        type: Boolean,
+        default: false,
       }
     }
   }