test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-11-29 18:48:13 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix(测试跟踪): 用例评审状态修复及去掉功能用例编辑返回按钮

Browse Source
This commit is contained in:
song-cc-rock 2023-03-01 11:46:06 +08:00 committed by fit2-zhao
parent 71abe6a72a
commit 17dd9c0730
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test-track/backend/src/main/java/io/metersphere/excel/converter/TestReviewCaseStatus.java
View File

@ -6,7 +6,8 @@ public enum TestReviewCaseStatus {
UnPass("execute_not_pass", 2), UnPass("execute_not_pass", 2),
Underway("test_case_review_status_underway", 3), Underway("test_case_review_status_underway", 3),
Again("test_case_status_again", 4), 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 String i18nKey;
private Integer order; private Integer order;

6
test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java
View File

@ -548,11 +548,13 @@ public class TestCaseReviewService {
TestCaseReview testCaseReview = new TestCaseReview(); TestCaseReview testCaseReview = new TestCaseReview();
testCaseReview.setId(reviewId); 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()); testCaseReview.setStatus(TestCaseReviewStatus.Underway.name());
testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview);
return; return;
} else if (statusList.contains(TestReviewCaseStatus.UnPass.name())) { }
if (statusList.contains(TestReviewCaseStatus.UnPass.name())) {
testCaseReview.setStatus(TestCaseReviewStatus.Finished.name()); testCaseReview.setStatus(TestCaseReviewStatus.Finished.name());
testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview);
return; return;

3
test-track/frontend/src/business/case/components/TestCaseEdit.vue
View File

@ -5,9 +5,6 @@
<!-- 创建 or 编辑用例 --> <!-- 创建 or 编辑用例 -->
<div class="edit-header-container"> <div class="edit-header-container">
<div class="header-content-row"> <div class="header-content-row">
<div class="back" @click="back" v-if="!isPublicShow">
<img src="/assets/module/figma/icon_arrow-left_outlined.svg" alt="" />
</div>
<div :class="'case-name'"> <div :class="'case-name'">
{{ !editable ? form.name : $t('test_track.case.create_case') }} {{ !editable ? form.name : $t('test_track.case.create_case') }}
</div> </div>

6
test-track/frontend/src/business/review/view/components/TestReviewTestCaseEditOperationBar.vue
View File

@ -177,19 +177,19 @@ export default {
uhPassCommentOpen() { uhPassCommentOpen() {
this.isCommentRequire = true; this.isCommentRequire = true;
this.commentTitle = this.$t('review.un_pass_review_confirm'); 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'); this.addCommentOpen('UnPass');
}, },
passCommentOpen() { passCommentOpen() {
this.isCommentRequire = false; this.isCommentRequire = false;
this.commentTitle = this.$t('review.pass_review_confirm'); 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'); this.addCommentOpen('Pass');
}, },
commentOpen() { commentOpen() {
this.isCommentRequire = true; this.isCommentRequire = true;
this.commentTitle = this.$t('case.comment'); 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(); this.addCommentOpen();
}, },
} }

2
test-track/frontend/src/i18n/lang/en-US.js
View File

@ -79,6 +79,8 @@ const message = {
un_pass_review_confirm: "Are you sure you don't pass this review", un_pass_review_confirm: "Are you sure you don't pass this review",
please_input_review_comment: "Please enter the review comments", please_input_review_comment: "Please enter the review comments",
pass_review_confirm: "Are you sure to pass this review", pass_review_confirm: "Are you sure to pass this review",
comment_require: "(require)",
comment_not_require: "(not_require)"
}, },
case: { case: {
all_case_content: "All case", all_case_content: "All case",

2
test-track/frontend/src/i18n/lang/zh-CN.js
View File

@ -79,6 +79,8 @@ const message = {
un_pass_review_confirm: "确定不通过此评审吗", un_pass_review_confirm: "确定不通过此评审吗",
please_input_review_comment: "请输入评审意见", please_input_review_comment: "请输入评审意见",
pass_review_confirm: "确定通过此评审吗", pass_review_confirm: "确定通过此评审吗",
comment_require: "(必填)",
comment_not_require: "(选填)"
}, },
case: { case: {
all_case_content: "全部用例", all_case_content: "全部用例",

2
test-track/frontend/src/i18n/lang/zh-TW.js
View File

@ -79,6 +79,8 @@ const message = {
un_pass_review_confirm: "確定不通過此評審嗎", un_pass_review_confirm: "確定不通過此評審嗎",
please_input_review_comment: "請輸入評審意見", please_input_review_comment: "請輸入評審意見",
pass_review_confirm: "確定通過此評審嗎", pass_review_confirm: "確定通過此評審嗎",
comment_require: "(必填)",
comment_not_require: "(選填)"
}, },
case: { case: {
all_case_content: "全部用例", all_case_content: "全部用例",