From 00a382b73657d9d58d57c2499754a6059f41d16d Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Wed, 27 Jan 2021 19:20:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89)=20=E8=A7=A3=E5=86=B3=E5=9C=A8=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E7=AB=99=E4=B8=AD=EF=BC=8CCase=E5=88=87=E6=8D=A2=E5=88=B0Api?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=9B=9E=E6=94=B6=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98=20(#1271)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/components/list/ApiList.vue  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 837f51cffd..e7abd10448 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -274,7 +274,12 @@
       },
     },
     created: function () {
-      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+      if (this.trashEnable) {
+        this.condition.filters = {status: ["Trash"]};
+      }
+      else {
+        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+      }
       this.initTable();
       this.getMaintainerOptions();
     },

From 5e292f2cfcd96a24f96c508c2656d00fc53cbdcc Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Wed, 27 Jan 2021 19:20:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92)=20=E8=A7=A3=E5=86=B3=E5=85=B3=E8=81=94=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=94=A8=E4=BE=8B=E6=97=B6tag=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=20(#1276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/comonents/api/RelevanceScenarioList.vue    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index b50dbfa2b3..d142385aaf 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -19,8 +19,8 @@
         </el-table-column>
         <el-table-column prop="tagNames" :label="$t('api_test.automation.tag')" width="200px">
           <template v-slot:default="scope">
-            <div v-for="itemName in scope.row.tagNames" :key="itemName">
-              <ms-tag type="success" effect="plain" :content="itemName"/>
+            <div v-for="itemName in getTagString(scope.row.tags)" :key="itemName">
+              <ms-tag type="success" effect="plain" :content="itemName.substring(1, itemName.length-1)"/>
             </div>
           </template>
         </el-table-column>
@@ -101,6 +101,15 @@
       },
     },
     methods: {
+      getTagString(tagsString) {
+        // if(tagsString.length == 2) {
+        if(tagsString.length >= 2 && tagsString[0] == '[' && tagsString[1] == ']') {
+          return null;
+        }
+        tagsString = tagsString.substring(1, tagsString.length - 1);
+        let tagList = tagsString.split(',');
+        return tagList;
+      },
       search() {
         this.selectRows = new Set();
         this.loading = true;