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

fix(测试用例): 导出excel增加编辑类型

This commit is contained in:
WangXu10 2024-08-15 18:15:34 +08:00 committed by 刘瑞斌
parent 8547743f36
commit f26372a899
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/framework/sdk/src/main/resources/i18n/case_en_US.properties
View File

@ -284,6 +284,7 @@ case.export.system.other.columns.create_user=Create user
case.export.system.other.columns.create_time=Create time
case.export.system.other.columns.update_user=Update user
case.export.system.other.columns.update_time=Update time
case.export.columns.case_edit_type=Edit type
export_case_task_stop=Stop export
export_case_task_existed=Export task already exists

1
backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties
View File

@ -281,6 +281,7 @@ case.export.system.other.columns.create_user=创建人
case.export.system.other.columns.create_time=创建时间
case.export.system.other.columns.update_user=更新人
case.export.system.other.columns.update_time=更新时间
case.export.columns.case_edit_type=编辑模式
export_case_task_stop=停止导出
export_case_task_existed=已有导出任务

1
backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties
View File

@ -285,6 +285,7 @@ case.export.system.other.columns.create_user=創建人
case.export.system.other.columns.create_time=創建時間
case.export.system.other.columns.update_user=更新人
case.export.system.other.columns.update_time=更新時間
case.export.columns.case_edit_type=編輯模式
export_case_task_stop=停止導出
export_case_task_existed=已有導出任務

6
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java
View File

@ -625,13 +625,13 @@ public class FunctionalCaseFileService {
private void buildBaseField(FunctionalCaseExcelData data, FunctionalCase functionalCase, FunctionalCaseBlob functionalCaseBlob, Map<String, String> moduleMap, List<String> textDescriptionList, List<String> expectedResultList, String url) {
data.setNum(functionalCase.getNum().toString());
data.setModule(moduleMap.get(functionalCase.getModuleId()));
data.setTags(functionalCase.getTags().toString());
//构建步骤
buildExportStep(data, functionalCaseBlob, functionalCase.getCaseEditType(), textDescriptionList, expectedResultList);
data.setPrerequisite(new String(functionalCaseBlob.getPrerequisite() == null ? new byte[0] : functionalCaseBlob.getPrerequisite(), StandardCharsets.UTF_8));
//标签
data.setTags(JSON.toJSONString(functionalCase.getTags()));
data.setCaseEditType(functionalCase.getCaseEditType());
// 设置超链接
WriteCellData<String> hyperlink = new WriteCellData<>(functionalCase.getName());
data.setHyperLinkName(hyperlink);
@ -874,6 +874,10 @@ public class FunctionalCaseFileService {
.collect(Collectors.toList()));
}
};
List<FunctionalCaseHeader> textDescription = request.getSystemFields().stream().filter(item -> StringUtils.equals(item.getId(), "text_description")).toList();
if (CollectionUtils.isNotEmpty(textDescription)) {
headList.add(Arrays.asList(Translator.get("case.export.columns.case_edit_type")));
}
return headList;
}