From 2534eafcf0708d785c9f4a5e827553e640b7fbd5 Mon Sep 17 00:00:00 2001 From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com> Date: Tue, 30 Mar 2021 16:19:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8Bexcel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=97=B6=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98=E3=80=82=20(#1756)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 黎龙鑫 Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com> --- .../track/service/TestCaseService.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java index 881d60f382..d4f7a9cf12 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -182,25 +182,19 @@ public class TestCaseService { List 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)) { - //MSException.throwException(Translator.get("test_case_already_exists")); - isExt = true; + if (StringUtils.equals(steps, caseSteps) && StringUtils.equals(remark, caseRemark)) { + //MSException.throwException(Translator.get("test_case_already_exists")); + return tc; } } } - if (isExt) { - return caseList.get(0); - } } return null; } From ab987403212781bf47000431051daf672d777cb8 Mon Sep 17 00:00:00 2001 From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com> Date: Tue, 30 Mar 2021 16:17:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?= =?UTF-8?q?=E4=BD=BF=E5=8F=AA=E8=AF=BB=E7=94=A8=E6=88=B7=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=20(#1758)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 黎龙鑫 --- .../components/track/report/components/TestPlanReportList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/business/components/track/report/components/TestPlanReportList.vue b/frontend/src/business/components/track/report/components/TestPlanReportList.vue index b4b7049506..2058420062 100644 --- a/frontend/src/business/components/track/report/components/TestPlanReportList.vue +++ b/frontend/src/business/components/track/report/components/TestPlanReportList.vue @@ -20,7 +20,7 @@ @@ -49,7 +49,7 @@ + @exec="handleDelete(scope.row)" v-tester/> From 32b26efc737b0a1708403aedd2ed190195c2904d Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 30 Mar 2021 16:41:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E5=AF=BC=E5=85=A5=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E9=87=8D=E5=A4=8D=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/i18n/messages_zh_CN.properties | 2 +- backend/src/main/resources/i18n/messages_zh_TW.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index ef493c103e..f158ce921c 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -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=功能测试不支持自动方式 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 85650bc3c6..321e8630fb 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -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=功能測試不支持自動方式