Merge remote-tracking branch 'origin/master'

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

@@ -103,6 +103,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         HTTPSamplerProxy sampler = new HTTPSamplerProxy();
         sampler.setEnabled(this.isEnable());
         sampler.setName(this.getName());
+        if (StringUtils.isEmpty(this.getName())) {
+            sampler.setName("HTTPSamplerProxy");
+        }
         String name = this.getParentName(this.getParent());
         if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
             sampler.setName(this.getName() + "<->" + name);
@@ -126,7 +129,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         // 添加环境中的公共变量
         Arguments arguments = this.addArguments(config);
         if (arguments != null) {
-            tree.add(config.valueSupposeMock(arguments));
+            tree.add(ParameterConfig.valueSupposeMock(arguments));
         }
         try {
             if (config.isEffective(this.getProjectId())) {

backend/src/main/java/io/metersphere/controller/ProjectController.java

@@ -91,6 +91,11 @@ public class ProjectController {
         return projectService.uploadFiles(projectId, files);
     }
 
+    @PostMapping(value = "/update/file/{projectId}/{fileId}", consumes = {"multipart/form-data"})
+    public FileMetadata updateFile(@PathVariable String projectId, @PathVariable String fileId, @RequestPart(value = "file") MultipartFile file) {
+        return projectService.updateFile(projectId, fileId, file);
+    }
+
     @GetMapping(value = "delete/file/{fileId}")
     public void deleteFile(@PathVariable String fileId) {
         projectService.deleteFile(fileId);

backend/src/main/java/io/metersphere/service/FileService.java

@@ -73,9 +73,13 @@ public class FileService {
         fileContentMapper.deleteByExample(example2);
     }
 
-    public FileMetadata saveFile(MultipartFile file, String projectId) {
+    public FileMetadata saveFile(MultipartFile file, String projectId, String fileId) {
         final FileMetadata fileMetadata = new FileMetadata();
+        if (StringUtils.isEmpty(fileId)) {
             fileMetadata.setId(UUID.randomUUID().toString());
+        } else {
+            fileMetadata.setId(fileId);
+        }
         fileMetadata.setName(file.getOriginalFilename());
         fileMetadata.setSize(file.getSize());
         fileMetadata.setProjectId(projectId);
@@ -97,6 +101,10 @@ public class FileService {
         return fileMetadata;
     }
 
+    public FileMetadata saveFile(MultipartFile file, String projectId) {
+        return saveFile(file, projectId, null);
+    }
+
     public FileMetadata saveFile(MultipartFile file) {
         return saveFile(file, null);
     }

backend/src/main/java/io/metersphere/service/ProjectService.java

@@ -186,6 +186,18 @@ public class ProjectService {
         return result;
     }
 
+    public FileMetadata updateFile(String projectId, String fileId, MultipartFile file) {
+        QueryProjectFileRequest request = new QueryProjectFileRequest();
+        request.setName(file.getOriginalFilename());
+        if (CollectionUtils.isEmpty(fileService.getProjectFiles(projectId, request))) {
+            fileService.deleteFileById(fileId);
+            return fileService.saveFile(file, projectId);
+        } else {
+            MSException.throwException(Translator.get("project_file_already_exists"));
+        }
+        return null;
+    }
+
     public void deleteFile(String fileId) {
         LoadTestFileExample example1 = new LoadTestFileExample();
         example1.createCriteria().andFileIdEqualTo(fileId);
@@ -216,4 +228,5 @@ public class ProjectService {
         }
         fileService.deleteFileById(fileId);
     }
+
 }

frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue

@@ -24,8 +24,7 @@
       <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
 
       <font-awesome-icon class="ms-alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="unFullScreen"/>
-      ｜
+      <!-- <i class="el-icon-close alt-ico-close" @click="close"/>-->
-      <i class="el-icon-close alt-ico-close" @click="close"/>
     </div>
   </div>
 </template>
@@ -124,16 +123,11 @@
 
   .ms-header-right {
     float: right;
-    width: 420px;
+    width: 380px;
-    margin-top: 2px;
+    margin-top: 4px;
     z-index: 1;
   }
 
-  .ms-alt-ico {
-    font-size: 16px;
-    margin: 10px 10px 0px;
-  }
-
   .alt-ico-close {
     font-size: 18px;
     margin: 10px 10px 10px;
@@ -144,6 +138,12 @@
     cursor: pointer;
   }
 
+  .ms-alt-ico {
+    color: #8c939d;
+    font-size: 16px;
+    margin: 10px 30px 0px;
+  }
+
   .ms-alt-ico:hover {
     color: black;
     cursor: pointer;

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

@@ -16,7 +16,7 @@
           :before-upload="beforeUploadFile"
           :http-request="handleUpload"
           :on-exceed="handleExceed"
-          :file-list="fileList">
+        >
           <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
                            :content="$t('load_test.upload_file')"/>
         </el-upload>
@@ -46,6 +46,23 @@
       </el-table-column>
       <el-table-column :label="$t('commons.operating')">
         <template v-slot:default="scope">
+          <el-upload
+            style="width: 38px; float: left;"
+            accept=".jmx,.jar,.csv,.json,.pdf,.jpg,.png,.jpeg,.doc,.docx,.xlsx"
+            action=""
+            :limit="fileNumLimit"
+            :show-file-list="false"
+            :before-upload="beforeUploadFile"
+            :http-request="handleUpdateUpload"
+            :on-exceed="handleExceed"
+          >
+            <el-button circle
+                       type="success"
+                       :disabled="!checkoutTestManagerOrTestUser()"
+                       icon="el-icon-edit"
+                       @click="handleEdit(scope.row)"
+                       size="mini"/>
+          </el-upload>
           <ms-table-operator-button :is-tester-permission="true"
                                     icon="el-icon-delete"
                                     type="danger"
@@ -65,7 +82,7 @@
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTableButton from "@/business/components/common/components/MsTableButton";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
-import {getCurrentProjectID} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser, getCurrentProjectID} from "@/common/js/utils";
 import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
 import {Message} from "element-ui";
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
@@ -87,9 +104,11 @@ export default {
       fileNumLimit: 10,
       condition: {},
       projectId: getCurrentProjectID(),
+      currentRow: null,
     }
   },
   methods: {
+    checkoutTestManagerOrTestUser,
     open(project) {
       this.projectId = project.id;
       this.loadFileVisible = true;
@@ -136,9 +155,40 @@ export default {
         this.getProjectFiles();
       });
     },
+    handleUpdateUpload(uploadResources) {
+      let file = uploadResources.file;
+      let i1 = file.name.lastIndexOf(".");
+      let i2 = this.currentRow.name.lastIndexOf(".");
+      let suffix1 = file.name.substring(i1);
+      let suffix2 = this.currentRow.name.substring(i2);
+      if (suffix1 !== suffix2) {
+        this.$error(this.$t('load_test.project_file_update_type_error'));
+        return;
+      }
+
+      let formData = new FormData();
+      let url = '/project/update/file/' + this.projectId + '/' + this.currentRow.id
+      formData.append("file", file);
+      let options = {
+        method: 'POST',
+        url: url,
+        data: formData,
+        headers: {
+          'Content-Type': undefined
+        }
+      }
+      this.$request(options, (response) => {
+        this.$success(this.$t('commons.save_success'));
+        this.currentRow = null;
+        this.getProjectFiles();
+      });
+    },
     handleExceed() {
       this.$error(this.$t('load_test.file_size_limit'));
     },
+    handleEdit(row) {
+      this.currentRow = row;
+    },
     handleDelete(row) {
       console.log(row);
       this.$confirm(this.$t('project.file_delete_tip', [row.name]), '', {

frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue

@@ -13,7 +13,7 @@
         <el-table-column type="selection"/>
         <el-table-column width="40" :resizable="false" align="center">
           <template v-slot:default="{row}">
-            <show-more-btn :is-show="isSelect(row)" :buttons="buttons" :size="selectRows.length"/>
+            <show-more-btn :is-show="isSelect(row)" :buttons="buttons" :size="selectRows.size"/>
           </template>
         </el-table-column>
         <template v-for="(item, index) in tableLabel">

frontend/src/i18n/en-US.js

@@ -540,7 +540,8 @@ export default {
     load_exist_jmx: 'Load Project JMX',
     threadgroup_at_least_one: 'At least one ThreadGroup is enabled',
     load_api_automation_jmx: 'Import API automation scenario',
-    project_file_exist: "The file already exists in the project, please import it directly"
+    project_file_exist: "The file already exists in the project, please import it directly",
+    project_file_update_type_error: 'Updated file types must be consistent'
   },
   api_test: {
     creator: "Creator",

frontend/src/i18n/zh-CN.js

@@ -539,7 +539,8 @@ export default {
     load_exist_jmx: '加载 JMX 文件',
     threadgroup_at_least_one: '至少启用一个线程组',
     load_api_automation_jmx: '引用接口自动化场景',
-    project_file_exist: "项目中已存在该文件，请直接引用"
+    project_file_exist: "项目中已存在该文件，请直接引用",
+    project_file_update_type_error: '更新的文件类型必须一致'
   },
   api_test: {
     creator: "创建人",

frontend/src/i18n/zh-TW.js

@@ -539,7 +539,8 @@ export default {
     load_exist_jmx: '加載 JMX 文件',
     threadgroup_at_least_one: '至少啟用一個線程組',
     load_api_automation_jmx: '引用接口自動化場景',
-    project_file_exist: "項目中已存在該文件，請直接引用"
+    project_file_exist: "項目中已存在該文件，請直接引用",
+    project_file_update_type_error: '更新的文件類型必須一致'
   },
   api_test: {
     creator: "創建人",