Merge remote-tracking branch 'origin/main'

This commit is contained in:
liqiang-fit2cloud 2022-10-13 18:40:03 +08:00
commit 17f0d0d530
2 changed files with 3 additions and 35 deletions

View File

@ -1259,7 +1259,7 @@ export default {
} }
this.customizeRequest = {}; this.customizeRequest = {};
this.sort(); this.sort();
this.reload(); this.cancelBatchProcessing();
}, },
addScenario(arr) { addScenario(arr) {
if (arr && arr.length > 0) { if (arr && arr.length > 0) {

View File

@ -139,8 +139,6 @@ export default {
}; };
}, },
created() { created() {
this.getTypes();
this.getProjectFiles();
}, },
methods: { methods: {
submit() { submit() {
@ -151,11 +149,6 @@ export default {
this.$warning("请选择一条数据"); this.$warning("请选择一条数据");
} }
}, },
changeList(pageSize, currentPage) {
this.currentPage = currentPage;
this.pageSize = pageSize;
this.getProjectFiles();
},
change(value) { change(value) {
this.showView = value; this.showView = value;
}, },
@ -166,15 +159,9 @@ export default {
this.visible = false; this.visible = false;
}, },
open() { open() {
this.visible = true; this.getTypes();
},
myFile() {
if (!this.condition.filters) {
this.condition.filters = {createUser: [getCurrentUserId()]};
} else {
this.condition.filters.createUser = [getCurrentUserId()];
}
this.getProjectFiles(); this.getProjectFiles();
this.visible = true;
}, },
getProjectFiles() { getProjectFiles() {
this.data.loading = getFileMetadataList(this.projectId, this.currentPage, this.pageSize, this.condition).then(res => { this.data.loading = getFileMetadataList(this.projectId, this.currentPage, this.pageSize, this.condition).then(res => {
@ -188,17 +175,6 @@ export default {
}); });
}); });
}, },
fileValidator(file) {
/// todo:
return file.size > 0;
},
beforeUploadFile(file) {
if (!this.fileValidator(file)) {
/// todo:
return false;
}
return true;
},
handleExceed() { handleExceed() {
this.$error(this.$t('load_test.file_size_limit')); this.$error(this.$t('load_test.file_size_limit'));
}, },
@ -224,14 +200,6 @@ export default {
}) })
}); });
}, },
moduleChange(ids) {
if (!this.condition.filters) {
this.condition.filters = {moduleIds: ids};
} else {
this.condition.filters.moduleIds = ids;
}
this.getProjectFiles();
},
moveSave(param) { moveSave(param) {
this.buildBatchParam(param); this.buildBatchParam(param);
} }