Merge remote-tracking branch 'origin/master'

This commit is contained in:
q4speed 2020-10-12 17:39:35 +08:00
commit fea3738797
4 changed files with 8 additions and 3 deletions

View File

@ -99,7 +99,7 @@
<select id="list" resultMap="BaseResultMap"
parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
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>
<if test="request.combine != null">
<include refid="combine">

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

View File

@ -374,6 +374,7 @@ export default {
},
statusChange(status) {
this.testCase.status = status;
this.saveCase();
},
saveCase() {
let param = {};
@ -398,6 +399,10 @@ export default {
this.$success(this.$t('commons.save_success'));
this.updateTestCases(param);
this.setPlanStatus(this.testCase.planId);
// Pass
if (this.testCase.status === 'Pass' && this.index < this.testCases.length - 1) {
this.handleNext();
}
});
},
updateTestCases(param) {

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