From 17dd9c0730cb7cfe40e0ef9311a6234cf3c7958e Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Wed, 1 Mar 2023 11:46:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8F=8A=E5=8E=BB=E6=8E=89=E5=8A=9F=E8=83=BD=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E7=BC=96=E8=BE=91=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/excel/converter/TestReviewCaseStatus.java | 3 ++- .../java/io/metersphere/service/TestCaseReviewService.java | 6 ++++-- .../frontend/src/business/case/components/TestCaseEdit.vue | 3 --- .../view/components/TestReviewTestCaseEditOperationBar.vue | 6 +++--- test-track/frontend/src/i18n/lang/en-US.js | 2 ++ test-track/frontend/src/i18n/lang/zh-CN.js | 2 ++ test-track/frontend/src/i18n/lang/zh-TW.js | 2 ++ 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java b/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java index f38b8b9d40..7eb01e15e0 100644 --- a/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java +++ b/test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java @@ -6,7 +6,8 @@ public enum TestReviewCaseStatus { UnPass("execute_not_pass", 2), Underway("test_case_review_status_underway", 3), Again("test_case_status_again", 4), - Prepare("test_case_status_prepare", 5); + Prepare("test_case_status_prepare", 5), + Rereview("test_case_review_status_re_review", 6); private String i18nKey; private Integer order; diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java index d4d6972b23..64e575a2ab 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java @@ -548,11 +548,13 @@ public class TestCaseReviewService { TestCaseReview testCaseReview = new TestCaseReview(); testCaseReview.setId(reviewId); - if (statusList.contains(TestReviewCaseStatus.Prepare.name()) || statusList.contains(TestReviewCaseStatus.Again.name())) { + if (statusList.contains(TestReviewCaseStatus.Prepare.name()) || statusList.contains(TestReviewCaseStatus.Again.name()) || + statusList.contains(TestReviewCaseStatus.Underway.name()) || statusList.contains(TestReviewCaseStatus.Rereview.name())) { testCaseReview.setStatus(TestCaseReviewStatus.Underway.name()); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); return; - } else if (statusList.contains(TestReviewCaseStatus.UnPass.name())) { + } + if (statusList.contains(TestReviewCaseStatus.UnPass.name())) { testCaseReview.setStatus(TestCaseReviewStatus.Finished.name()); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); return; diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue index 76d6ab7d1b..4bff071e42 100644 --- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue +++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue @@ -5,9 +5,6 @@
-
- -
{{ !editable ? form.name : $t('test_track.case.create_case') }}
diff --git a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEditOperationBar.vue b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEditOperationBar.vue index 29800a3823..dbf906460e 100644 --- a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEditOperationBar.vue +++ b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEditOperationBar.vue @@ -177,19 +177,19 @@ export default { uhPassCommentOpen() { this.isCommentRequire = true; this.commentTitle = this.$t('review.un_pass_review_confirm'); - this.commentTip = this.$t('review.please_input_review_comment'); + this.commentTip = this.$t('review.please_input_review_comment') + this.$t('review.comment_require'); this.addCommentOpen('UnPass'); }, passCommentOpen() { this.isCommentRequire = false; this.commentTitle = this.$t('review.pass_review_confirm'); - this.commentTip = this.$t('review.please_input_review_comment'); + this.commentTip = this.$t('review.please_input_review_comment') + this.$t('review.comment_not_require'); this.addCommentOpen('Pass'); }, commentOpen() { this.isCommentRequire = true; this.commentTitle = this.$t('case.comment'); - this.commentTip = this.$t('commons.input_content'); + this.commentTip = this.$t('commons.input_content') + this.$t('review.comment_not_require'); this.addCommentOpen(); }, } diff --git a/test-track/frontend/src/i18n/lang/en-US.js b/test-track/frontend/src/i18n/lang/en-US.js index b3dd0f5788..d6b363035c 100644 --- a/test-track/frontend/src/i18n/lang/en-US.js +++ b/test-track/frontend/src/i18n/lang/en-US.js @@ -79,6 +79,8 @@ const message = { un_pass_review_confirm: "Are you sure you don't pass this review", please_input_review_comment: "Please enter the review comments", pass_review_confirm: "Are you sure to pass this review", + comment_require: "(require)", + comment_not_require: "(not_require)" }, case: { all_case_content: "All case", diff --git a/test-track/frontend/src/i18n/lang/zh-CN.js b/test-track/frontend/src/i18n/lang/zh-CN.js index c99cd36cc8..a45969ad3b 100644 --- a/test-track/frontend/src/i18n/lang/zh-CN.js +++ b/test-track/frontend/src/i18n/lang/zh-CN.js @@ -79,6 +79,8 @@ const message = { un_pass_review_confirm: "确定不通过此评审吗", please_input_review_comment: "请输入评审意见", pass_review_confirm: "确定通过此评审吗", + comment_require: "(必填)", + comment_not_require: "(选填)" }, case: { all_case_content: "全部用例", diff --git a/test-track/frontend/src/i18n/lang/zh-TW.js b/test-track/frontend/src/i18n/lang/zh-TW.js index ca19268933..7fa7d0e404 100644 --- a/test-track/frontend/src/i18n/lang/zh-TW.js +++ b/test-track/frontend/src/i18n/lang/zh-TW.js @@ -79,6 +79,8 @@ const message = { un_pass_review_confirm: "確定不通過此評審嗎", please_input_review_comment: "請輸入評審意見", pass_review_confirm: "確定通過此評審嗎", + comment_require: "(必填)", + comment_not_require: "(選填)" }, case: { all_case_content: "全部用例",