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/master'

This commit is contained in:
q4speed 2020-10-12 17:39:35 +08:00
parent 7fdb637948 a4ee354778
commit fea3738797
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
View File

@ -99,7 +99,7 @@
<select id="list" resultMap="BaseResultMap" <select id="list" resultMap="BaseResultMap"
parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest"> parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
select test_plan.*, user.name as user_name from test_plan select test_plan.*, user.name as user_name from test_plan
JOIN user ON user.id = test_plan.principal LEFT JOIN user ON user.id = test_plan.principal
<where> <where>
<if test="request.combine != null"> <if test="request.combine != null">
<include refid="combine"> <include refid="combine">

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit cf6b06526324326a563d933e07118fac014a63b4 Subproject commit ee74568be0beba46da19616f5832e83f9164c688

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

@ -374,6 +374,7 @@ export default {
}, },
statusChange(status) { statusChange(status) {
this.testCase.status = status; this.testCase.status = status;
this.saveCase();
}, },
saveCase() { saveCase() {
let param = {}; let param = {};
@ -398,6 +399,10 @@ export default {
this.$success(this.$t('commons.save_success')); this.$success(this.$t('commons.save_success'));
this.updateTestCases(param); this.updateTestCases(param);
this.setPlanStatus(this.testCase.planId); this.setPlanStatus(this.testCase.planId);
// 结果为Pass时 自动跳转到下一用例
if (this.testCase.status === 'Pass' && this.index < this.testCases.length - 1) {
this.handleNext();
}
}); });
}, },
updateTestCases(param) { updateTestCases(param) {

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1 Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9