From da5438e42c8de7ddfdf0a10146a7a953128123ae Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 16 Jan 2023 18:09:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=9C=A8=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=BE=85=E5=AE=8C=E6=88=90=E6=97=B6=E8=BF=87=E6=BB=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1021803 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001021803
---
 .../frontend/src/business/component/ApiCaseTableList.vue | 6 +-----
 .../src/business/component/ApiDefinitionTableList.vue    | 9 ++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

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 => {