test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.4' into v1.4

This commit is contained in:
Captain.B 2020-10-28 17:20:19 +08:00
parent 9987bb9be4 5b305a288a
commit e97231657b
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
View File

@ -6,11 +6,11 @@
parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest"> parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest">
select distinct test_case_review.id, test_case_review.name, test_case_review.creator, test_case_review.status, select distinct test_case_review.id, test_case_review.name, test_case_review.creator, test_case_review.status,
test_case_review.create_time, test_case_review.update_time, test_case_review.end_time, test_case_review.create_time, test_case_review.update_time, test_case_review.end_time,
test_case_review.description test_case_review.description, user.name as creatorName
from test_case_review, project, test_case_review_project from test_case_review join test_case_review_project on test_case_review.id = test_case_review_project.review_id
join project on test_case_review_project.project_id = project.id
left join user on test_case_review.creator = user.id
<where> <where>
test_case_review.id = test_case_review_project.review_id
and test_case_review_project.project_id = project.id
<if test="request.name != null"> <if test="request.name != null">
and test_case_review.name like CONCAT('%', #{request.name},'%') and test_case_review.name like CONCAT('%', #{request.name},'%')
</if> </if>

1
backend/src/main/java/io/metersphere/track/dto/TestCaseReviewDTO.java
View File

@ -10,4 +10,5 @@ public class TestCaseReviewDTO extends TestCaseReview {
private String projectName; private String projectName;
private String reviewerName; private String reviewerName;
private String creatorName;
} }

9
frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
View File

@ -25,7 +25,7 @@
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="12" class="head-right"> <el-col :span="11" class="head-right">
<span class="head-right-tip" v-if="index + 1 === testCases.length"> <span class="head-right-tip" v-if="index + 1 === testCases.length">
{{ $t('test_track.plan_view.pre_case') }} : {{ {{ $t('test_track.plan_view.pre_case') }} : {{
testCases[index - 1] ? testCases[index - 1].name : '' testCases[index - 1] ? testCases[index - 1].name : ''
@ -44,11 +44,6 @@
<el-button plain size="mini" icon="el-icon-arrow-down" <el-button plain size="mini" icon="el-icon-arrow-down"
:disabled="index + 1 >= testCases.length" :disabled="index + 1 >= testCases.length"
@click="handleNext()"/> @click="handleNext()"/>
<el-divider direction="vertical"></el-divider>
<el-button type="primary" size="mini" :disabled="isReadOnly" @click="saveCase()">
{{ $t('test_track.save') }}
</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -577,6 +572,8 @@ export default {
this.isFailure = this.testCase.steptResults.filter(s => { this.isFailure = this.testCase.steptResults.filter(s => {
return s.executeResult === 'Failure' || s.executeResult === 'Blocking'; return s.executeResult === 'Failure' || s.executeResult === 'Blocking';
}).length > 0; }).length > 0;
} else {
this.isFailure = false;
} }
}, },
saveIssues() { saveIssues() {

6
frontend/src/business/components/track/review/components/TestCaseReviewList.vue
View File

@ -30,7 +30,7 @@
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creator" prop="creatorName"
:label="$t('test_track.review.review_creator')" :label="$t('test_track.review.review_creator')"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
@ -66,10 +66,6 @@
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)" <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
@deleteClick="handleDelete(scope.row)"> @deleteClick="handleDelete(scope.row)">
<!-- <template v-slot:middle>-->
<!-- <ms-table-operator-button :isTesterPermission="true" type="success" tip="重新发起" icon="el-icon-document"-->
<!-- @exec="reCreate(scope.row)"/>-->
<!-- </template>-->
</ms-table-operator> </ms-table-operator>
</template> </template>
</el-table-column> </el-table-column>