diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index b23321eba5..6930ce6025 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -274,7 +274,7 @@ #{value} - + and test_case.review_status in #{value} diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index 8a6220194d..353891d7b0 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -303,20 +303,12 @@ export default { }, created: function () { this.$emit('setCondition', this.condition); - if (this.trashEnable) { - this.condition.filters = {status: ["Trash"]}; - } else { - this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]}; - } + this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]}; this.initTableData(); getSystemLabel(this, this.type) }, activated() { - if (this.trashEnable) { - this.condition.filters = {status: ["Trash"]}; - } else { - this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]}; - } + this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]}; this.initTableData(); }, watch: { @@ -372,15 +364,15 @@ export default { case 'coverage': this.condition.caseCoverage = 'coverage'; break; - /* case 'Prepare': - this.condition.filters.status = [this.selectDataRange]; + case 'Prepare': + this.condition.filters.reviewStatus = [this.selectDataRange]; break; case 'Pass': - this.condition.filters.status = [this.selectDataRange]; + this.condition.filters.reviewStatus = [this.selectDataRange]; break; case 'UnPass': - this.condition.filters.status = [this.selectDataRange]; - break;*/ + this.condition.filters.reviewStatus = [this.selectDataRange]; + break; } if (this.projectId) { this.condition.projectId = this.projectId; diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 07951ba17a..2115bd28a9 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd +Subproject commit 2115bd28a90854d2b6276a90878934715498c584