diff --git a/workstation/frontend/src/business/component/ApiCaseTableList.vue b/workstation/frontend/src/business/component/ApiCaseTableList.vue index e90f6a7b57..9a53261411 100644 --- a/workstation/frontend/src/business/component/ApiCaseTableList.vue +++ b/workstation/frontend/src/business/component/ApiCaseTableList.vue @@ -591,11 +591,7 @@ export default { } else { this.batchButtons = this.commonButtons; } - if (this.condition.filters) { - this.condition.filters.case_status = ["Prepare", "Underway"]; - } else { - this.condition.filters = {case_status: ["Prepare", "Underway"]}; - } + this.condition.filters = {case_status: ["Prepare", "Underway"]}; this.condition.combine = {creator: {operator: "current user", value: "current user",}} if (this.condition.toUpdate) { delete this.condition.toUpdate diff --git a/workstation/frontend/src/business/component/ApiDefinitionTableList.vue b/workstation/frontend/src/business/component/ApiDefinitionTableList.vue index 730f58d0c4..405640baec 100644 --- a/workstation/frontend/src/business/component/ApiDefinitionTableList.vue +++ b/workstation/frontend/src/business/component/ApiDefinitionTableList.vue @@ -603,6 +603,7 @@ export default { if (!this.projectName || this.projectName === "") { this.getProjectName(); } + console.log("clearFilter") /*this.condition.orders = getLastTableSortField(this.tableHeaderKey);*/ if (this.isFocus) { if (this.condition.filters) { @@ -671,6 +672,8 @@ export default { this.condition.toBeUpdated = !this.isFinish; if (!this.isFinish) { this.condition.filters = {status: ["Prepare", "Underway", "Completed"]}; + } else { + this.condition.filters = {status: ["Prepare", "Underway", "NO"]}; } this.initTable(); }, @@ -678,11 +681,7 @@ export default { methods: { changeTabState(name) { this.$refs.apiTable.clearFilter(); - if (name === 'update') { - this.isFinish = false; - } else { - this.isFinish = true; - } + this.isFinish = name !== 'update'; }, getProjectName() { getProject(this.projectId).then(response => {