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-26 09:52:39 +08:00
parent 4cf1dd112b 767faf9dfe
commit 5ebe6756df
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
View File

@ -213,7 +213,7 @@ public abstract class MsTestElement {
csvDataSet.setName(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName()); csvDataSet.setName(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName());
csvDataSet.setProperty("fileEncoding", StringUtils.isEmpty(item.getEncoding()) ? "UTF-8" : item.getEncoding()); csvDataSet.setProperty("fileEncoding", StringUtils.isEmpty(item.getEncoding()) ? "UTF-8" : item.getEncoding());
if (CollectionUtils.isNotEmpty(item.getFiles())) { if (CollectionUtils.isNotEmpty(item.getFiles())) {
if (!config.isOperating() && new File(BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName()).exists()) { if (!config.isOperating() && !new File(BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName()).exists()) {
MSException.throwException(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName() + "：[ CSV文件不存在 ]"); MSException.throwException(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName() + "：[ CSV文件不存在 ]");
} }
csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName()); csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName());

3
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
View File

@ -433,7 +433,7 @@
this.result.loading = false; this.result.loading = false;
this.unSelection = data.listObject.map(s => s.id); this.unSelection = data.listObject.map(s => s.id);
if (this.$refs.scenarioTable) { if (this.$refs.scenarioTable) {
setTimeout(this.$refs.scenarioTable.doLayout,500) setTimeout(this.$refs.scenarioTable.doLayout, 200)
} }
}); });
} }
@ -464,6 +464,7 @@
moveSave(param) { moveSave(param) {
this.buildBatchParam(param); this.buildBatchParam(param);
param.apiScenarioModuleId = param.nodeId; param.apiScenarioModuleId = param.nodeId;
param.modulePath = param.nodePath;
this.$post('/api/automation/batch/edit', param, () => { this.$post('/api/automation/batch/edit', param, () => {
this.$success(this.$t('commons.save_success')); this.$success(this.$t('commons.save_success'));
this.$refs.testBatchMove.close(); this.$refs.testBatchMove.close();

2
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -340,7 +340,7 @@ export default {
} }
}) })
if (this.$refs.caseTable) { if (this.$refs.caseTable) {
setTimeout(this.$refs.caseTable.doLayout,500) setTimeout(this.$refs.caseTable.doLayout, 200)
} }
}); });
} }

2
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -464,7 +464,7 @@
} }
}) })
if (this.$refs.apiDefinitionTable) { if (this.$refs.apiDefinitionTable) {
setTimeout(this.$refs.apiDefinitionTable.doLayout, 500) setTimeout(this.$refs.apiDefinitionTable.doLayout, 200)
} }
}); });

2
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -399,7 +399,7 @@ export default {
item.tags = JSON.parse(item.tags); item.tags = JSON.parse(item.tags);
}) })
if (this.$refs.table) { if (this.$refs.table) {
setTimeout(this.$refs.table.doLayout,500) setTimeout(this.$refs.table.doLayout, 200)
} }
}); });

2
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
View File

@ -477,7 +477,7 @@ export default {
} }
this.selectRows.clear(); this.selectRows.clear();
if (this.$refs.table) { if (this.$refs.table) {
setTimeout(this.$refs.table.doLayout,500) setTimeout(this.$refs.table.doLayout, 200)
} }
}); });
} }