From 23da6a5473b3dffa3ee6b694074776b45c8f6f68 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 24 Aug 2021 18:05:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E6=A0=B9=E6=8D=AE=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20#10061?=
 =?UTF-8?q?44=20--bug=3D1006144=20--user=3D=E8=B5=B5=E5=8B=87=20=E3=80=90?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E3=80=91=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89...=20https://www.tapd.cn/55049933/s/1038801?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/list/ApiList.vue    | 71 ++++++++++---------
 1 file changed, 37 insertions(+), 34 deletions(-)

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 bd81d598d5..a53169e321 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -38,12 +38,12 @@
           min-width="120"/>
         <span v-for="(item) in fields" :key="item.key">
           <ms-table-column
-               prop="num"
-               label="ID"
-               :field="item"
-               min-width="100px"
-               :fields-width="fieldsWidth"
-               sortable>
+            prop="num"
+            label="ID"
+            :field="item"
+            min-width="100px"
+            :fields-width="fieldsWidth"
+            sortable>
 
             <template slot-scope="scope">
               <el-tooltip content="编辑">
@@ -141,7 +141,7 @@
           <template v-slot:default="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
-        </ms-table-column >
+        </ms-table-column>
 
         <ms-table-column
           prop="caseTotal"
@@ -206,7 +206,7 @@ import CaseBatchMove from "@/business/components/api/definition/components/basis
 import {
   initCondition,
   getCustomTableHeader, getCustomTableWidth, buildBatchParam, checkTableRowIsSelected,
-  saveLastTableSortField,getLastTableSortField
+  saveLastTableSortField, getLastTableSortField
 } from "@/common/js/tableUtils";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import {Body} from "@/business/components/api/definition/model/ApiTestModel";
@@ -238,7 +238,7 @@ export default {
   data() {
     return {
       type: API_LIST,
-      tableHeaderKey:"API_DEFINITION",
+      tableHeaderKey: "API_DEFINITION",
       fields: getCustomTableHeader('API_DEFINITION'),
       fieldsWidth: getCustomTableWidth('API_DEFINITION'),
       condition: {
@@ -409,16 +409,16 @@ export default {
     projectId() {
       return getCurrentProjectID();
     },
-    getApiRequestTypeName(){
-      if(this.currentProtocol === 'TCP'){
+    getApiRequestTypeName() {
+      if (this.currentProtocol === 'TCP') {
         return this.$t('api_test.definition.api_agreement');
-      }else{
+      } else {
         return this.$t('api_test.definition.api_type');
       }
     }
   },
   created: function () {
-    if(!this.projectName || this.projectName === ""){
+    if (!this.projectName || this.projectName === "") {
       this.getProjectName();
     }
     if (this.trashEnable) {
@@ -429,7 +429,7 @@ export default {
       this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
     }
     let orderArr = this.getSortField();
-    if(orderArr){
+    if (orderArr) {
       this.condition.orders = orderArr;
     }
     this.initTable();
@@ -437,7 +437,7 @@ export default {
   },
   watch: {
     selectNodeIds() {
-      if(!this.trashEnable){
+      if (!this.trashEnable) {
         initCondition(this.condition, false);
         this.currentPage = 1;
         this.condition.moduleIds = [];
@@ -450,7 +450,7 @@ export default {
       this.currentPage = 1;
       initCondition(this.condition, false);
       this.closeCaseModel();
-      this.initTable();
+      this.initTable(true);
     },
     trashEnable() {
       if (this.trashEnable) {
@@ -467,10 +467,10 @@ export default {
     }
   },
   methods: {
-    getProjectName (){
+    getProjectName() {
       this.$get('project/get/' + this.projectId, response => {
         let project = response.data;
-        if(project){
+        if (project) {
           this.projectName = project.name;
         }
       });
@@ -478,20 +478,20 @@ export default {
     handleBatchMove() {
       this.$refs.testCaseBatchMove.open(this.moduleTree, [], this.moduleOptions);
     },
-    closeCaseModel(){
+    closeCaseModel() {
       //关闭案例弹窗
-      if(this.$refs.caseList){
+      if (this.$refs.caseList) {
         this.$refs.caseList.handleClose();
       }
     },
-    initTable() {
+    initTable(currentProtocol) {
       if (this.$refs.table) {
         this.$refs.table.clear();
       }
 
       initCondition(this.condition, this.condition.selectAll);
       this.selectDataCounts = 0;
-      if(!this.trashEnable){
+      if (!this.trashEnable) {
         this.condition.moduleIds = this.selectNodeIds;
       }
       this.condition.projectId = this.projectId;
@@ -523,6 +523,9 @@ export default {
           this.condition.filters.status = [this.selectDataRange];
           break;
       }
+      if (currentProtocol) {
+        this.condition.moduleIds = [];
+      }
       if (this.condition.projectId) {
         this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
           this.genProtocalFilter(this.condition.protocol);
@@ -537,7 +540,7 @@ export default {
           checkTableRowIsSelected(this, this.$refs.table);
         });
       }
-      if(this.needRefreshModule()){
+      if (this.needRefreshModule()) {
         this.$emit("refreshTree");
       }
     },
@@ -591,7 +594,7 @@ export default {
         });
       });
     },
-    enterSearch(){
+    enterSearch() {
       this.$refs.inputVal.blur();
       this.search();
     },
@@ -797,7 +800,7 @@ export default {
           obj.nodeTree = nodeTree;
           downloadFile("Metersphere_Api_" + this.projectName + ".json", JSON.stringify(obj));
         } else {
-          downloadFile("Swagger_Api_" + this.projectName+ ".json", JSON.stringify(obj));
+          downloadFile("Swagger_Api_" + this.projectName + ".json", JSON.stringify(obj));
         }
       });
     },
@@ -812,24 +815,24 @@ export default {
     open() {
       this.$refs.searchBar.open();
     },
-    needRefreshModule(){
-      if(this.initApiTableOpretion === '0'){
+    needRefreshModule() {
+      if (this.initApiTableOpretion === '0') {
         return true;
-      }else {
-        this.$emit('updateInitApiTableOpretion','0');
+      } else {
+        this.$emit('updateInitApiTableOpretion', '0');
         return false;
       }
     },
-    saveSortField(key,orders){
-      saveLastTableSortField(key,JSON.stringify(orders));
+    saveSortField(key, orders) {
+      saveLastTableSortField(key, JSON.stringify(orders));
     },
-    getSortField(){
+    getSortField() {
       let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
       let returnObj = null;
-      if(orderJsonStr){
+      if (orderJsonStr) {
         try {
           returnObj = JSON.parse(orderJsonStr);
-        }catch (e){
+        } catch (e) {
           return null;
         }
       }