From c76cc9a432a3ddfbb8c982aafc5e02d8a5614ccb Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 27 May 2021 16:05:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/track/service/TestCaseReviewService.java | 4 +++- .../java/io/metersphere/track/service/TestPlanService.java | 4 +++- frontend/src/business/components/track/case/TestCase.vue | 2 +- .../src/business/components/track/head/TrackHeaderMenus.vue | 2 +- frontend/src/i18n/en-US.js | 6 ++++-- frontend/src/i18n/zh-CN.js | 6 ++++-- frontend/src/i18n/zh-TW.js | 6 ++++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java index ff1c552fd1..4313255f60 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java @@ -566,7 +566,9 @@ public class TestCaseReviewService { stringBuilder.append(userMap.get(id)).append("、"); } } - name = stringBuilder.substring(0, stringBuilder.length() - 1); + if (StringUtils.isNotBlank(stringBuilder)) { + name = stringBuilder.substring(0, stringBuilder.length() - 1); + } } return name; } diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java index 5ea2dd6edc..ab0d714444 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -717,7 +717,9 @@ public class TestPlanService { for (Project project : projects) { stringBuilder.append(project.getName()).append("、"); } - projectName = stringBuilder.substring(0, stringBuilder.length() - 1); + if (StringUtils.isNotBlank(stringBuilder)) { + projectName = stringBuilder.substring(0, stringBuilder.length() - 1); + } } return projectName; diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue index 35c2ea1191..346445601b 100644 --- a/frontend/src/business/components/track/case/TestCase.vue +++ b/frontend/src/business/components/track/case/TestCase.vue @@ -257,7 +257,7 @@ export default { }, exportTestCase() { if (this.activeDom !== 'left') { - this.$warning('请切换成接口列表导出！'); + this.$warning(this.$t('test_track.case.export.export_tip')); return; } this.$refs.testCaseList.exportTestCase(); diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue index 6850add588..cd6de12a9f 100644 --- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue +++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue @@ -23,7 +23,7 @@ - {{ $t("缺陷管理") }} + {{ $t('test_track.issue.issue_management') }} diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index fd1f01bb8b..ab64720ff8 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -1085,7 +1085,7 @@ export default { swagger_url_import: "Import using URL", timing_synchronization: "Timing synchronization", next_synchronization_time: "Next synchronization time", - ms_env_import_file_limit: "It supports JSON format files exported through metersphere", + ms_env_import_file_limit: "It only supports JSON format files exported through metersphere", file_exceed_limit: "The number of files exceeds the limit", }, home_page: { @@ -1371,7 +1371,8 @@ export default { continue_upload: "Upload continue", }, export: { - export: "Export cases" + export: "Export cases", + export_tip: "Switch to Interface List and check Use Case Export" } }, plan: { @@ -1544,6 +1545,7 @@ export default { }, issue: { issue: "Issue", + issue_management: "Issue Management", issue_resource: "Issue source", create_issue: "Create Issue", add_issue: "Add Issue", diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 44ddb87e67..0860ed316a 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1087,7 +1087,7 @@ export default { swagger_url_import: "使用URL导入", timing_synchronization: "定时同步", next_synchronization_time: "下次同步时间", - ms_env_import_file_limit: "支持通过MeterSphere导出的json格式文件", + ms_env_import_file_limit: "仅支持通过MeterSphere导出的json格式文件", file_exceed_limit: "文件数量超出限制", @@ -1375,7 +1375,8 @@ export default { continue_upload: "继续上传", }, export: { - export: "导出用例" + export: "导出用例", + export_tip: "请切换成接口列表勾选用例导出！" } }, plan: { @@ -1549,6 +1550,7 @@ export default { }, issue: { issue: "缺陷", + issue_management: "缺陷管理", issue_resource: "缺陷来源", create_issue: "创建缺陷", add_issue: "添加缺陷", diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 40913c195f..f24d0968c1 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -1087,7 +1087,7 @@ export default { swagger_url_import: "使用URL導入", timing_synchronization: "定時同步", next_synchronization_time: "下次同步時間", - ms_env_import_file_limit: "支持通過MeterSphere導出的json格式文件", + ms_env_import_file_limit: "僅支持通過MeterSphere導出的json格式文件", file_exceed_limit: "文件數量超出限制", @@ -1375,7 +1375,8 @@ export default { continue_upload: "繼續上傳", }, export: { - export: "導出用例" + export: "導出用例", + export_tip: "請切換成接口列表勾選用例導出！" } }, plan: { @@ -1549,6 +1550,7 @@ export default { }, issue: { issue: "缺陷", + issue_management: "缺陷管理", issue_resource: "缺陷來源", create_issue: "創建缺陷", add_issue: "添加缺陷",