test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-02 12:09:13 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix(性能测试): 性能测试查找附件不再限制文件格式

Browse Source 
--bug=1029674 --user=宋天阳
【性能测试】github#26460，【性能测试】性能测试-资源文件处，上传.dat文件，提示上传成功，但是下面并没有显示出对应文件
https://www.tapd.cn/55049933/s/1411099
This commit is contained in:
song-tianyang 2023-09-01 15:44:33 +08:00 committed by fit2-zhao
parent 52deefe6fc
commit e4d6984e6d
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
View File

@ -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>

18
performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
View File

@ -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) {

23
performance-test/frontend/src/business/test/components/ExistFiles.vue
View File

@ -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() {