test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-03 20:49:56 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/metersphere/metersphere

Browse Source
This commit is contained in:
liqiang-fit2cloud 2023-01-06 16:41:41 +08:00
commit ad09d17a60
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-test/backend/src/main/java/io/metersphere/api/dto/definition/SaveApiTestCaseRequest.java
View File

@ -24,4 +24,7 @@ public class SaveApiTestCaseRequest extends ApiTestCase {
private List<String> follows;
private String versionId;
//复制用例时的源ID。主要用于复制本地文件等操作。
private String sourceIdByCopy;
}

7
api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
View File

@ -438,7 +438,12 @@ public class ApiTestCaseService {
checkNameExist(request);
ApiFileUtil.createBodyFiles(request.getId(), bodyFiles);
request.setRequest(tcpApiParamService.parseMsTestElement(request.getRequest()));
ApiFileUtil.copyBdyFile(request.getApiDefinitionId(), request.getId());
if (StringUtils.isNotBlank(request.getSourceIdByCopy())) {
ApiFileUtil.copyBdyFile(request.getSourceIdByCopy(), request.getId());
} else {
ApiFileUtil.copyBdyFile(request.getApiDefinitionId(), request.getId());
}
final ApiTestCaseWithBLOBs test = new ApiTestCaseWithBLOBs();
test.setId(request.getId());

1
api-test/frontend/src/business/definition/components/ApiConfig.vue
View File

@ -403,7 +403,6 @@ export default {
data.request.protocol = this.currentProtocol;
}
if (data.isCopy) {
data.sourceId = data.id;
data.id = getUUID();
data.request.id = data.id;
} else {

7
api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue
View File

@ -992,7 +992,7 @@ export default {
getDefinitionById(row.apiDefinitionId).then((response) => {
let api = response.data;
if (api) {
this.getCaseAndOpen(row.id, api.name, row.apiDefinitionId);
this.getCaseAndOpen(row.id, api.name, row.apiDefinitionId, true);
}
});
},
@ -1004,7 +1004,7 @@ export default {
}
});
},
getCaseAndOpen(id, apiName, apiId) {
getCaseAndOpen(id, apiName, apiId, isCopyCase) {
getCaseById(id).then((response) => {
let data = response.data;
let uuid = getUUID();
@ -1030,6 +1030,9 @@ export default {
url: apiCaseRequest.path,
uuid: uuid,
};
if (isCopyCase) {
obj.sourceIdByCopy = id;
}
this.$refs.caseList.copy(obj);
});
},

1
api-test/frontend/src/business/definition/components/list/ApiList.vue
View File

@ -879,6 +879,7 @@ export default {
handleCopy(row) {
let obj = JSON.parse(JSON.stringify(row));
obj.isCopy = true;
obj.sourceId = row.id;
delete obj.id;
this.$emit('copyApi', obj);
},