From 738e9bfda7416fe8f74d21f042904b51e999ccb9 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Sep 2021 13:49:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20#1006479=20#1006481=20=20=E3=80=90=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95=E3=80=91=E5=9C=BA=E6=99=AF=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6=E7=AB=99=E5=85=A8=E9=80=89=E6=89=B9=E9=87=8F=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=81=A2=E5=A4=8D10?=
 =?UTF-8?q?=E6=9D=A1=E3=80=81=E5=85=A8=E9=80=89=E6=98=BE=E7=A4=BA=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【接口测试】场景回收站全选批量恢复，只能恢复10条】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006481；【【接口测试】全选框显示数据错误】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006479
---
 .../automation/scenario/ApiScenarioList.vue    | 12 +++++++++---
 .../common/components/table/MsTable.vue        |  1 +
 .../table/MsTableHeaderSelectPopover.vue       | 18 ++++++++++++++----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index e4b30dc32e..4fd4eba358 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -719,9 +719,15 @@ export default {
     },
     handleBatchRestore() {
       let ids = this.$refs.scenarioTable.selectIds;
-      this.$post("/api/automation/reduction", ids, response => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
+      let params = {};
+      this.buildBatchParam(params);
+      params.ids = ids;
+      this.$post("/api/automation/id/all", params, response => {
+        let idParams = response.data;
+        this.$post("/api/automation/reduction", idParams, response => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        });
       });
     },
     handleDeleteBatch(row) {
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index ea2b53ec25..b7acae7735 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -20,6 +20,7 @@
       <ms-table-header-select-popover v-if="enableSelection && showSelectAll" ref="selectPopover"
                                       :page-size="pageSize > total ? total : pageSize"
                                       :table-data-count-in-page="data.length"
+                                      :select-type="condition.selectAll"
                                       :total="total"
                                       @selectPageAll="isSelectDataAll(false)"
                                       @selectAll="isSelectDataAll(true)"/>
diff --git a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
index 9ffdeabf5b..f705afa880 100644
--- a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
+++ b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
@@ -29,6 +29,7 @@
       name: "MsTableHeaderSelectPopover",
       // props: ['total', 'pageSize', 'selectDataCounts'],
       props: {
+        selectType: String,
         total: {
           type: Number,
           default() {
@@ -54,6 +55,11 @@
           }
         },
       },
+      watch:{
+        total(){
+          this.reload();
+        }
+      },
       created() {
         if(this.keyIndex === 0){
           this.keyIndex++;
@@ -93,10 +99,14 @@
           this.$emit(even);
         },
         reload() {
-            this.isShow = false;
-            this.$nextTick(() => {
-              this.isShow = true;
-            });
+          if(!this.selectType){
+            this.selectAllFontColor.color = "gray";
+            this.selectPageFontColor.color = "gray";
+          }
+          this.isShow = false;
+          this.$nextTick(() => {
+            this.isShow = true;
+          });
         }
       }
     }