From 21de1ba11ff11ccd5bb0baf8b7e2db6928782c0c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 25 Mar 2021 11:20:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectController.java         |  7 ++-
 .../io/metersphere/service/FileService.java   | 14 +++--
 .../metersphere/service/ProjectService.java   | 13 +++++
 .../test/components/ResourceFiles.vue         | 54 ++++++++++++++++++-
 frontend/src/i18n/en-US.js                    |  3 +-
 frontend/src/i18n/zh-CN.js                    |  3 +-
 frontend/src/i18n/zh-TW.js                    |  3 +-
 7 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/ProjectController.java b/backend/src/main/java/io/metersphere/controller/ProjectController.java
index 1711633b9b..f9feec4b15 100644
--- a/backend/src/main/java/io/metersphere/controller/ProjectController.java
+++ b/backend/src/main/java/io/metersphere/controller/ProjectController.java
@@ -88,7 +88,12 @@ public class ProjectController {
 
     @PostMapping(value = "upload/files/{projectId}", consumes = {"multipart/form-data"})
     public List<FileMetadata> uploadFiles(@PathVariable String projectId, @RequestPart(value = "file") List<MultipartFile> files) {
-      return  projectService.uploadFiles(projectId, files);
+        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}")
diff --git a/backend/src/main/java/io/metersphere/service/FileService.java b/backend/src/main/java/io/metersphere/service/FileService.java
index cc2aa106c2..817ca5826d 100644
--- a/backend/src/main/java/io/metersphere/service/FileService.java
+++ b/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();
-        fileMetadata.setId(UUID.randomUUID().toString());
+        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);
     }
@@ -205,7 +213,7 @@ public class FileService {
         if (!StringUtils.isEmpty(request.getName())) {
             criteria.andNameEqualTo(request.getName());
         }
-       return fileMetadataMapper.selectByExample(example);
+        return fileMetadataMapper.selectByExample(example);
     }
 
     public List<FileMetadata> getFileMetadataByIds(List<String> fileIds) {
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index 4723f29dc3..7fea391b86 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/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);
     }
+
 }
diff --git a/frontend/src/business/components/performance/test/components/ResourceFiles.vue b/frontend/src/business/components/performance/test/components/ResourceFiles.vue
index 5e26e276f2..b05920888b 100644
--- a/frontend/src/business/components/performance/test/components/ResourceFiles.vue
+++ b/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]), '', {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 5957b0d37c..a563e26c77 100644
--- a/frontend/src/i18n/en-US.js
+++ b/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",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 00f23098a7..8c5bcc9afc 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/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: "创建人",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 498764aa55..61aaa62a43 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/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: "創建人",