From 9d8c0b731ea48e42bb4837a9c03fe0606b8f4d8b Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 26 Jan 2021 13:55:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=97-=E8=A1=A8=E5=A4=B4=E5=85=A8?=
 =?UTF-8?q?=E9=80=89=E8=8F=9C=E5=8D=95=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复接口定义固定列-表头全选菜单不展的问题
---
 .../definition/components/list/ApiCaseSimpleList.vue  | 11 ++++++-----
 .../api/definition/components/list/ApiList.vue        |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 65e8dd5b93..bee3e51558 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -11,7 +11,7 @@
       <el-table v-loading="result.loading"
                 ref="caseTable"
                 border
-                :data="tableData" row-key="id" class="test-content adjust-table ms-select-all"
+                :data="tableData" row-key="id" class="test-content adjust-table ms-select-all-fixed"
                 @select-all="handleSelectAll"
                 @filter-change="filter"
                 @sort-change="sort"
@@ -19,7 +19,7 @@
 
         <el-table-column type="selection" width="50"/>
 
-        <ms-table-select-all
+        <ms-table-header-select-popover v-show="total>0"
           :page-size="pageSize>total?total:pageSize"
           :total="total"
           @selectPageAll="isSelectDataAll(false)"
@@ -74,7 +74,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
+        <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
           <template v-slot:default="scope">
             <!--<el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable">{{$t('commons.reduction')}}</el-button>-->
 <!--            <el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{ $t('commons.edit') }}-->
@@ -131,14 +131,15 @@ import MsSetEnvironment from "@/business/components/api/definition/components/ba
 import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
 import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
 import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+// import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
 import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
 import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
 
 export default {
     name: "ApiCaseSimpleList",
     components: {
-      MsTableSelectAll,
+      MsTableHeaderSelectPopover,
       MsSetEnvironment,
       ApiCaseList,
       PriorityTableItem,
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 d1dbb8c32d..4382831131 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -13,12 +13,12 @@
                 border
                 @sort-change="sort"
                 @filter-change="filter"
-                :data="tableData" row-key="id" class="test-content adjust-table ms-select-all"
+                :data="tableData" row-key="id" class="test-content adjust-table ms-select-all-fixed"
                 @select-all="handleSelectAll"
                 @select="handleSelect" :height="screenHeight">
         <el-table-column width="50" type="selection"/>
 
-        <ms-table-select-all
+        <ms-table-header-select-popover v-show="total>0"
           :page-size="pageSize>total?total:pageSize"
           :total="total"
           @selectPageAll="isSelectDataAll(false)"
@@ -160,7 +160,8 @@
   import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
   import {WORKSPACE_ID} from '@/common/js/constants';
   import ApiListContainer from "./ApiListContainer";
-  import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+  // import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+  import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
   import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
   import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
   import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
@@ -170,7 +171,7 @@
     name: "ApiList",
     components: {
       ApiStatus,
-      MsTableSelectAll,
+      MsTableHeaderSelectPopover,
       ApiListContainer,
       MsTableButton,
       MsTableOperatorButton,