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

Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8

This commit is contained in:
fit2-zhao 2021-03-26 16:29:35 +08:00
parent dda1217c1a f5796eb602
commit 12f1c60a0f
3 changed files with 9 additions and 17 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/ExtTestCaseMapper.xml
View File

@ -274,7 +274,7 @@
#{value} #{value}
</foreach> </foreach>
</when> </when>
<when test="key=='status'"> <when test="key=='reviewStatus'">
and test_case.review_status in and test_case.review_status in
<foreach collection="values" item="value" separator="," open="(" close=")"> <foreach collection="values" item="value" separator="," open="(" close=")">
#{value} #{value}

22
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -303,20 +303,12 @@ export default {
}, },
created: function () { created: function () {
this.$emit('setCondition', this.condition); this.$emit('setCondition', this.condition);
if (this.trashEnable) { this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
this.condition.filters = {status: ["Trash"]};
} else {
this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
}
this.initTableData(); this.initTableData();
getSystemLabel(this, this.type) getSystemLabel(this, this.type)
}, },
activated() { activated() {
if (this.trashEnable) { this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
this.condition.filters = {status: ["Trash"]};
} else {
this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
}
this.initTableData(); this.initTableData();
}, },
watch: { watch: {
@ -372,15 +364,15 @@ export default {
case 'coverage': case 'coverage':
this.condition.caseCoverage = 'coverage'; this.condition.caseCoverage = 'coverage';
break; break;
/* case 'Prepare': case 'Prepare':
this.condition.filters.status = [this.selectDataRange]; this.condition.filters.reviewStatus = [this.selectDataRange];
break; break;
case 'Pass': case 'Pass':
this.condition.filters.status = [this.selectDataRange]; this.condition.filters.reviewStatus = [this.selectDataRange];
break; break;
case 'UnPass': case 'UnPass':
this.condition.filters.status = [this.selectDataRange]; this.condition.filters.reviewStatus = [this.selectDataRange];
break;*/ break;
} }
if (this.projectId) { if (this.projectId) {
this.condition.projectId = this.projectId; this.condition.projectId = this.projectId;

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd Subproject commit 2115bd28a90854d2b6276a90878934715498c584