From 5eec3db477bba3f72fd6ff0fa47656a0909cb99e Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 28 Jan 2021 11:13:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA-?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B-=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E6=89=B9=E9=87=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91-=E9=9D=A2=E6=9D=BF=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试跟踪-测试用例-选择所有数据批量编辑-面板只显示当前页面数据的问题
---
 .../table/MsTableHeaderSelectPopover.vue        | 17 -----------------
 .../track/case/components/BatchEdit.vue         |  3 ++-
 .../track/case/components/TestCaseList.vue      | 10 +++++++++-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
index bca7760b96..f5ee7b6f64 100644
--- a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
+++ b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
@@ -15,23 +15,6 @@
       props: ['total', 'pageSize'],
       data() {
         return {
-          gridData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }]
         };
       }
     }
diff --git a/frontend/src/business/components/track/case/components/BatchEdit.vue b/frontend/src/business/components/track/case/components/BatchEdit.vue
index 9054126560..0fd6678255 100644
--- a/frontend/src/business/components/track/case/components/BatchEdit.vue
+++ b/frontend/src/business/components/track/case/components/BatchEdit.vue
@@ -81,7 +81,8 @@
         if (size) {
           this.size = size;
         } else {
-          this.size = this.$parent.selectRows.size;
+          // this.size = this.$parent.selectRows.size;
+          this.size = this.$parent.selectDataCounts;
         }
         listenGoBack(this.handleClose);
       },
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 791dcb6ef2..f63ddc8a7d 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -46,7 +46,7 @@
 
         <el-table-column width="40" :resizable="false" align="center">
           <template v-slot:default="scope">
-            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectRows.size"/>
+            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
           </template>
         </el-table-column>
         <el-table-column
@@ -292,6 +292,7 @@ export default {
       },
       currentCaseId: null,
       projectId: "",
+      selectDataCounts: 0,
     }
   },
   props: {
@@ -328,6 +329,7 @@ export default {
       this.condition.nodeIds = [];
       this.condition.selectAll = false;
       this.condition.unSelectIds = [];
+      this.selectDataCounts = 0;
       if (this.planId) {
         // param.planId = this.planId;
         this.condition.planId = this.planId;
@@ -435,6 +437,7 @@ export default {
       _handleSelect(this, selection, row, this.selectRows);
       this.setUnSelectIds();
     },
+
     importTestCase() {
       if (!getCurrentProjectID()) {
         this.$warning(this.$t('commons.check_project_tip'));
@@ -553,6 +556,11 @@ export default {
       this.condition.unSelectIds = allIDs.filter(function (val) {
         return ids.indexOf(val) === -1
       });
+      if (this.condition.selectAll) {
+        this.selectDataCounts = this.total - this.condition.unSelectIds.length;
+      } else {
+        this.selectDataCounts = this.selectRows.size;
+      }
     },
     moveSave(param) {
       param.condition = this.condition;