test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.8'

This commit is contained in:
Captain.B 2021-03-30 14:53:13 +08:00
parent 6bc2601bc7 0f1676166c
commit 575cc7dbed
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/db/migration/V79__v1.8.1_release.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE file_metadata
MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name';

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

@ -154,35 +154,39 @@ export default {
}
let rows = this.existFiles.filter(f => this.selectIds.has(f.id));
let jmxIds = [];
for (let i = 0; i < rows.length; i++) {
let row = rows[i];
if (this.tableData.filter(f => f.name === row.name).length > 0) {
this.$error(this.$t('load_test.delete_file') + ', name: ' + row.name);
this.selectIds.clear();
return;
setTimeout(() => {
this.$warning(this.$t('load_test.delete_file') + 'name: ' + row.name);
}, 100);
continue;
}
if (row.type.toUpperCase() === 'JMX') {
jmxIds.push(row.id);
}
this.tableData.push({
name: row.name,
size: (row.size / 1024).toFixed(2) + ' KB',
type: row.type.toUpperCase(),
updateTime: row.lastModified,
});
}
if (this.loadType === 'resource') {
rows.forEach(row => {
this.fileList.push(row);
this.tableData.push({
name: row.name,
size: (row.size / 1024).toFixed(2) + ' KB',
type: row.type.toUpperCase(),
updateTime: row.lastModified,
});
})
this.$success(this.$t('test_track.case.import.success'));
this.loadFileVisible = false;
this.selectIds.clear();
this.close();
return;
}
this.getJmxContents();
this.getJmxContents(jmxIds);
},
getJmxContents() {
this.projectLoadingResult = this.$post('/performance/export/jmx', [...this.selectIds], (response) => {
getJmxContents(jmxIds) {
this.projectLoadingResult = this.$post('/performance/export/jmx', jmxIds, (response) => {
let data = response.data;
if (!data) {
return;
@ -195,18 +199,11 @@ export default {
});
let file = new File([d.jmx], d.name);
this.uploadList.push(file);
this.tableData.push({
name: file.name,
size: (file.size / 1024).toFixed(2) + ' KB',
type: 'JMX',
updateTime: file.lastModified,
});
});
this.$emit('fileChange', this.scenarios);
this.$success(this.$t('test_track.case.import.success'));
this.loadFileVisible = false;
this.selectIds.clear();
this.close();
});
},
beforeUploadFile(file) {