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

fix: 测试用例导入标签

This commit is contained in:
chenjianxing 2021-03-31 14:21:56 +08:00
parent 5dd39b60e5
commit 57bddf4bd0
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java
View File

@ -142,7 +142,7 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
public void saveData() { public void saveData() {
//excel中用例都有错误时就返回，只要有用例可用于更新或者插入就不返回 //excel中用例都有错误时就返回，只要有用例可用于更新或者插入就不返回
if (!errList.isEmpty() && list.size() == 0 && updateList.size() == 0) { if (!errList.isEmpty()) {
return; return;
} }
@ -231,6 +231,13 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
*/ */
public String modifyTagPattern(TestCaseExcelData data){ public String modifyTagPattern(TestCaseExcelData data){
String tags = data.getTags(); String tags = data.getTags();
try {
if (StringUtils.isNotBlank(tags)) {
JSONArray.parse(tags);
return tags;
}
return "[]";
} catch (Exception e) {
if (tags != null) { if (tags != null) {
Stream<String> stringStream = Arrays.stream(tags.split("[,;，；]")); //当标签值以中英文的逗号和分号分隔时才能正确解析 Stream<String> stringStream = Arrays.stream(tags.split("[,;，；]")); //当标签值以中英文的逗号和分号分隔时才能正确解析
List<String> tagList = stringStream.map(tag -> tag = "\"" + tag + "\"") List<String> tagList = stringStream.map(tag -> tag = "\"" + tag + "\"")
@ -238,8 +245,9 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
String modifiedTags = StringUtils.join(tagList, ","); String modifiedTags = StringUtils.join(tagList, ",");
modifiedTags = "[" + modifiedTags + "]"; modifiedTags = "[" + modifiedTags + "]";
return modifiedTags; return modifiedTags;
}else { } else {
return null; return "[]";
}
} }
} }