From adff3b26f05b53fb49726cd7cc54c5cdc39c55e0 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 26 May 2021 17:41:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtable=E9=AB=98=E5=BA=A6=E5=92=8C=E5=85=A8?=
 =?UTF-8?q?=E9=80=89checkbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/table/MsTable.vue       |  4 +-
 .../components/track/issue/IssueList.vue      |  2 +
 .../report/components/TestPlanReportList.vue  | 42 +++++++++++--------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index 9e85133168..174f1a3f6c 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -82,8 +82,8 @@ export default {
   },
   props: {
     screenHeight: {
-      type: Number,
-      default: 400,
+      type: String,
+      default: '400',
     },
     selectNodeIds: {
       type: Array,
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index 23d1ad05e6..118b785a5d 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -16,6 +16,7 @@
         :page-size.sync="page.pageSize"
         :operators="operators"
         :show-select-all="false"
+        :screen-height="screenHeight"
         @handlePageChange="getIssues"
         @refresh="getIssues">
 
@@ -104,6 +105,7 @@ export default {
   data() {
     return {
       page: getPageInfo(),
+      screenHeight: 'calc(100vh - 310px)',
       operators: [
         {
           tip: this.$t('commons.edit'), icon: "el-icon-edit",
diff --git a/frontend/src/business/components/track/report/components/TestPlanReportList.vue b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
index 3cc0a7b784..44bcc545ae 100644
--- a/frontend/src/business/components/track/report/components/TestPlanReportList.vue
+++ b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
@@ -10,15 +10,18 @@
               @select="handleSelect"
               :height="screenHeight"
               ref="testPlanReportTable"
-              row-key="id" class="test-content adjust-table ms-select-all"
-      @filter-change="filter" @sort-change="sort" >
+              row-key="id"
+              class="test-content adjust-table ms-select-all-fixed"
+              @filter-change="filter" @sort-change="sort">
 
       <el-table-column width="50" type="selection"/>
-      <ms-table-select-all
-        :page-size="pageSize>total?total:pageSize"
-        :total="total"
-        @selectPageAll="isSelectDataAll(false)"
-        @selectAll="isSelectDataAll(true)"/>
+
+      <ms-table-header-select-popover v-show="total>0"
+                                      :page-size="pageSize > total ? total : pageSize"
+                                      :total="total"
+                                      :select-data-counts="selectDataCounts"
+                                      @selectPageAll="isSelectDataAll(false)"
+                                      @selectAll="isSelectDataAll(true)"/>
 
       <el-table-column width="30" :resizable="false" align="center">
         <template v-slot:default="scope">
@@ -26,9 +29,12 @@
         </template>
       </el-table-column>
 
-      <el-table-column min-width="300" prop="name" :label="$t('test_track.report.list.name')" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="testPlanName" min-width="150" sortable :label="$t('test_track.report.list.test_plan')" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="creator" :label="$t('test_track.report.list.creator')" show-overflow-tooltip></el-table-column>
+      <el-table-column min-width="300" prop="name" :label="$t('test_track.report.list.name')"
+                       show-overflow-tooltip></el-table-column>
+      <el-table-column prop="testPlanName" min-width="150" sortable :label="$t('test_track.report.list.test_plan')"
+                       show-overflow-tooltip></el-table-column>
+      <el-table-column prop="creator" :label="$t('test_track.report.list.creator')"
+                       show-overflow-tooltip></el-table-column>
       <el-table-column prop="createTime" sortable :label="$t('test_track.report.list.create_time' )" show-overflow-tooltip>
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
@@ -81,10 +87,12 @@ import {
   initCondition,
   setUnSelectIds, toggleAllSelection,
 } from "@/common/js/tableUtils";
+import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
 
 export default {
   name: "TestPlanReportList",
   components: {
+    MsTableHeaderSelectPopover,
     TestPlanReportView,
     MsTableOperator, MsTableOperatorButton, MsTableHeader, MsTablePagination,
     ReportTriggerModeItem, MsTag,
@@ -102,7 +110,7 @@ export default {
       pageSize: 10,
       isTestManagerOrTestUser: false,
       selectRows: new Set(),
-      screenHeight: document.documentElement.clientHeight - 296,//屏幕高度
+      screenHeight: 'calc(100vh - 295px)', //屏幕高度
       total: 0,
       tableData: [],
       statusFilters: [
@@ -264,11 +272,11 @@ export default {
   color: #1E90FF;
 }
 
-.ms-select-all >>> th:first-child {
-  margin-top: 20px;
-}
+/*.ms-select-all >>> th:first-child {*/
+/*  margin-top: 20px;*/
+/*}*/
 
-.ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
-  top: -2px;
-}
+/*.ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {*/
+/*  top: -2px;*/
+/*}*/
 </style>