From e4d6984e6d12c3307f430e96891a8c483c502ba5 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 1 Sep 2023 15:44:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=9F=A5=E6=89=BE=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=86=8D=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1029674 --user=宋天阳
【性能测试】github#26460，【性能测试】性能测试-资源文件处，上传.dat文件，提示上传成功，但是下面并没有显示出对应文件
https://www.tapd.cn/55049933/s/1411099
---
 .../base/mapper/ext/ExtLoadTestMapper.xml     | 14 +++++++----
 .../service/PerformanceTestService.java       | 18 +++++++--------
 .../business/test/components/ExistFiles.vue   | 23 ++++++++-----------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 1288e12531..32d8bf07cc 100644
--- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -369,11 +369,15 @@
     <select id="getProjectFiles" resultType="io.metersphere.base.domain.FileMetadata">
         SELECT file_metadata.*
         FROM file_metadata
-        WHERE file_metadata.type IN
-        <foreach collection="loadTypes" item="id" separator="," open="(" close=")">
-            #{id}
-        </foreach>
-        AND project_id = #{projectId,jdbcType=VARCHAR}
+        WHERE
+        project_id = #{projectId,jdbcType=VARCHAR}
+        <if test="loadTypes != null and loadTypes.size() > 0">
+            AND file_metadata.type IN
+            <foreach collection="loadTypes" item="id" separator="," open="(" close=")">
+                #{id}
+            </foreach>
+        </if>
+
         <if test="request.name != null">
             AND file_metadata.name LIKE CONCAT('%', #{request.name}, '%')
         </if>
diff --git a/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java b/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
index faafd754a4..515e730f63 100644
--- a/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
+++ b/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
@@ -752,17 +752,17 @@ public class PerformanceTestService {
     }
 
     public List<FileMetadata> getProjectFiles(String projectId, String loadType, QueryProjectFileRequest request) {
-        List<String> loadTypes = new ArrayList<>();
-        loadTypes.add(StringUtils.upperCase(loadType));
         if (StringUtils.equalsIgnoreCase(loadType, "resource")) {
-            List<String> fileTypes = Arrays.stream(FileType.values()).filter(fileType -> !fileType.equals(FileType.JMX)).map(FileType::name).collect(Collectors.toList());
-            loadTypes.addAll(fileTypes);
+            return extLoadTestMapper.getProjectFiles(projectId, null, request);
+        } else {
+            List<String> loadTypes = new ArrayList<>();
+            loadTypes.add(StringUtils.upperCase(loadType));
+            if (StringUtils.equalsIgnoreCase(loadType, "all")) {
+                List<String> fileTypes = Arrays.stream(FileType.values()).map(FileType::name).collect(Collectors.toList());
+                loadTypes.addAll(fileTypes);
+            }
+            return extLoadTestMapper.getProjectFiles(projectId, loadTypes, request);
         }
-        if (StringUtils.equalsIgnoreCase(loadType, "all")) {
-            List<String> fileTypes = Arrays.stream(FileType.values()).map(FileType::name).collect(Collectors.toList());
-            loadTypes.addAll(fileTypes);
-        }
-        return extLoadTestMapper.getProjectFiles(projectId, loadTypes, request);
     }
 
     public List<LoadTestExportJmx> exportJmx(List<String> fileIds) {
diff --git a/performance-test/frontend/src/business/test/components/ExistFiles.vue b/performance-test/frontend/src/business/test/components/ExistFiles.vue
index 358b21c460..ceca4ccf37 100644
--- a/performance-test/frontend/src/business/test/components/ExistFiles.vue
+++ b/performance-test/frontend/src/business/test/components/ExistFiles.vue
@@ -179,21 +179,16 @@ export default {
         });
       }
     },
-    handleSelectionChange(selection, row) {
-      if (this.selectIds.has(row.id)) {
-        this.selectIds.delete(row.id);
-        for (let i = 0; i < this.selectFiles.length - 1; i++) {
-          if (this.selectFiles[i].id === row.id) {
-            this.selectFiles.splice(i, 1);
-          }
-        }
-      } else {
-        if (!this.selectIds.has(row.id)) {
+    handleSelectionChange(selection, clickRow) {
+      this.selectIds = new Set;
+      this.selectFiles = [];
+      if (selection.length != 0) {
+        selection.forEach(row => {
           this.selectIds.add(row.id);
-        }
-        if (this.selectFiles.filter(f => f.id === row.id).length === 0) {
-          this.selectFiles.push(row);
-        }
+          if (this.selectFiles.filter(f => f.id === row.id).length === 0) {
+            this.selectFiles.push(row);
+          }
+        })
       }
     },
     getProjectFiles() {