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' of https://github.com/metersphere/metersphere into v1.8

This commit is contained in:
fit2-zhao 2021-03-30 16:45:58 +08:00
parent 0a7ce73e6a 01480fc6f2
commit 52ce3f288b
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -182,25 +182,19 @@ public class TestCaseService {
List<TestCaseWithBLOBs> caseList = testCaseMapper.selectByExampleWithBLOBs(example);
// 如果上边字段全部相同，去检查 steps 和 remark
boolean isExt = false;
String caseRemark = testCase.getRemark();
if (StringUtils.isBlank(caseRemark)) {
caseRemark = "";
}
// 如果上边字段全部相同，去检查 remark 和 steps
if (!CollectionUtils.isEmpty(caseList)) {
String caseRemark = testCase.getRemark();
String caseSteps = testCase.getSteps();
for (TestCaseWithBLOBs tc : caseList) {
String steps = tc.getSteps();
String remark = tc.getRemark();
if (StringUtils.equals(steps, testCase.getSteps()) && StringUtils.equals(remark, caseRemark)) {
if (StringUtils.equals(steps, caseSteps) && StringUtils.equals(remark, caseRemark)) {
//MSException.throwException(Translator.get("test_case_already_exists"));
isExt = true;
return tc;
}
}
}
if (isExt) {
return caseList.get(0);
}
}
return null;
}

2
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -144,7 +144,7 @@ password_format_is_incorrect=有效密码：8-30位，英文大小写字母+数
please_input_workspace_member=请填写该工作空间相关人员
test_case_report_template_repeat=同一工作空间下不能存在同名模版
plan_name_already_exists=测试计划名称已存在
test_case_already_exists_excel=导入文件中存在重复用例
test_case_already_exists_excel=文件中存在多条相同用例
test_case_module_already_exists=同层级下已存在该模块名称
api_test_name_already_exists=测试名称已经存在
functional_method_tip=功能测试不支持自动方式

2
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -144,7 +144,7 @@ password_format_is_incorrect=有效密碼：8-30位，英文大小寫字母+數
please_input_workspace_member=請填寫該工作空間相關人員
test_case_report_template_repeat=同壹工作空間下不能存在同名模版
plan_name_already_exists=測試計劃名稱已存在
test_case_already_exists_excel=導入文件中存在重復用例
test_case_already_exists_excel=文件中存在多條相同用例
test_case_module_already_exists=同層級下已存在該模塊名稱
api_test_name_already_exists=測試名稱已經存在
functional_method_tip=功能測試不支持自動方式

4
frontend/src/business/components/track/report/components/TestPlanReportList.vue
View File

@ -20,7 +20,7 @@
<el-table-column width="30" :resizable="false" align="center">
<template v-slot:default="scope">
<show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
<show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts" v-tester/>
</template>
</el-table-column>
@ -49,7 +49,7 @@
<ms-table-operator-button :tip="$t('test_track.plan_view.view_report')" icon="el-icon-document"
@exec="openReport(scope.row.id)"/>
<ms-table-operator-button type="danger" :tip="$t('commons.delete')" icon="el-icon-delete"
@exec="handleDelete(scope.row)" />
@exec="handleDelete(scope.row)" v-tester/>
</template>
</el-table-column>
</el-table>