From 29ab9b301ac711ac3c7e961fc3fa8b5e46abfa04 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 26 Jan 2021 11:05:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96-=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8-=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=93=8D=E4=BD=9C=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复接口自动化-场景列表-批量操作下拉框不显示操作的问题
---
 .../automation/scenario/ApiScenarioList.vue   | 21 ++++++++--
 .../api/automation/scenario/ReferenceView.vue |  2 +-
 .../definition/components/list/ApiList.vue    |  2 +-
 .../table/MsTableHeaderSelectPopover.vue      | 42 +++++++++++++++++++
 frontend/src/common/css/main.css              | 33 +++++++++++++++
 5 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 53278e4d8b..1f12944f44 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -6,12 +6,12 @@
                          :show-create="false"/>
       </template>
 
-      <el-table ref="scenarioTable" border :data="tableData" class="adjust-table ms-select-all" @select-all="select" @select="select"
+      <el-table ref="scenarioTable" border :data="tableData" class="adjust-table ms-select-all-fixed" @select-all="select" @select="select"
                 v-loading="loading">
 
         <el-table-column type="selection" width="50"/>
 
-        <ms-table-select-all v-if="!referenced"
+        <ms-table-header-select-popover v-show="total>0"
                              :page-size="pageSize>total?total:pageSize"
                              :total="total"
                              @selectPageAll="isSelectDataAll(false)"
@@ -121,7 +121,8 @@
   import MsTableMoreBtn from "./TableMoreBtn";
   import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
   import MsTestPlanList from "./testplan/TestPlanList";
-  import MsTableSelectAll from "../../../common/components/table/MsTableSelectAll";
+  // import MsTableSelectAll from "../../../common/components/table/MsTableSelectAll";
+  import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
   import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
   import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
   import PriorityTableItem from "../../../track/common/tableItems/planview/PriorityTableItem";
@@ -139,7 +140,7 @@
       BatchEdit,
       PlanStatusTableItem,
       PriorityTableItem,
-      MsTableSelectAll,
+      MsTableHeaderSelectPopover,
       MsTablePagination,
       MsTableMoreBtn,
       ShowMoreBtn,
@@ -544,4 +545,16 @@
     background-color: #409EFF;
     border-color: #409EFF;
   }
+  /deep/ .el-table__fixed-body-wrapper {
+    z-index: auto !important;
+  }
+  /deep/ el-table__fixed-right{
+
+  }
+    /deep/ .el-table__fixed-right {
+      height: 100% !important;
+    }
+    /deep/ .el-table__fixed {
+      height: 110px !important;
+    }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/ReferenceView.vue b/frontend/src/business/components/api/automation/scenario/ReferenceView.vue
index c46a71000b..8095fc1a98 100644
--- a/frontend/src/business/components/api/automation/scenario/ReferenceView.vue
+++ b/frontend/src/business/components/api/automation/scenario/ReferenceView.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="$t('api_test.automation.scenario_ref')" :visible.sync="visible"
-             width="45%" :destroy-on-close="true" append-to-body>
+             width="45%" :destroy-on-close="true" >
     <span>{{ $t('api_test.automation.scenario_ref') }}：</span>
     <div class="refs" v-loading="scenarioLoading">
       <div v-for="(item, index) in scenarioRefs" :key="index" class="el-button--text">{{ item.name }}</div>
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 fed69a9dc9..d1dbb8c32d 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -110,7 +110,7 @@
           :label="$t('api_test.definition.api_case_passing_rate')"
           show-overflow-tooltip/>
 
-        <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">
             <ms-table-operator-button :tip="$t('commons.reduction')" icon="el-icon-refresh-left" @exec="reductionApi(scope.row)" v-if="trashEnable" v-tester/>
             <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="editApi(scope.row)" v-else v-tester/>
diff --git a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
new file mode 100644
index 0000000000..bca7760b96
--- /dev/null
+++ b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
@@ -0,0 +1,42 @@
+<template>
+  <el-table-column width="1" :resizable="false" align="center">
+    <el-popover slot="header" placement="right" trigger="click" style="margin-right: 0px;">
+      <el-link @click.native.stop="$emit('selectAll')">{{$t('api_test.batch_menus.select_all_data',[total])}}</el-link>
+      <br/>
+      <el-link @click.native.stop="$emit('selectPageAll')">{{$t('api_test.batch_menus.select_show_data',[pageSize])}}</el-link>
+      <i class="el-icon-arrow-down" slot="reference"></i>
+    </el-popover>
+  </el-table-column>
+</template>
+
+<script>
+    export default {
+      name: "MsTableSelectAll",
+      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 弄'
+          }]
+        };
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 1fd8c090e6..ede9d49cb0 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -169,3 +169,36 @@ html,body {
   width: 30px;
 }
 /* 表格全选样式 --> */
+
+/* <-- 表格全选样式 (列固定表格样式) */
+.ms-select-all-fixed th:first-child.el-table-column--selection {
+  border: 1px solid #DCDFE6;
+  border-radius:5px;
+  padding: 0px;
+  margin-top: 10px;
+  display: inline-block;
+  /*margin-top: 25px;*/
+  width: 50px;
+}
+
+.ms-select-all-fixed th:nth-child(2) {
+  overflow: visible;
+}
+
+.ms-select-all-fixed th:first-child.el-table-column--selection>.cell {
+  padding: 5px;
+  width: 35px;
+}
+
+.ms-select-all-fixed th:nth-child(2)>.cell {
+  overflow: visible;
+}
+
+.ms-select-all-fixed th:nth-child(2) .el-icon-arrow-down {
+  position: absolute;
+  display: inline-block;
+  top: -4px;
+  left: -30px;
+  width: 30px;
+}
+/* 表格全选样式 --> */