From 973c0e6720775cd2baa4c685705748025ae83bee Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 10:46:16 +0800
Subject: [PATCH] no message

Former-commit-id: 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly ad5d4dfc63a11806f8520cace706ce6991799b1c [formerly d6b1c89dc39dbce331512f34ade3fd3aeb29aba5]]]]]
Former-commit-id: 30ac8d35a30f7c5d94147f7d2bfbd857459cdb15
Former-commit-id: 89d37a785bec75e4ab66271007c977b0d4b2269e
Former-commit-id: 0c1688272fc8ed888c40103e4754a0c98b064066 [formerly 3472c47ed9e316f10ff391f948848261772dbd41]
Former-commit-id: 527a5962a449368887d774783c39870527b1b972
Former-commit-id: 716620c7a2611ae6a6e65911b82a783cd3f18f00
Former-commit-id: 4db3f7630ffa62162b7e907d2a57791b747306b9
Former-commit-id: 1aa9c3087bb6df186392e09c85b88e64fb39daf9
Former-commit-id: b1eee3017a0c4654e6314d49a6d9c008213dc9c4
---
 src/assets/style/theme/theme-base.scss        | 39 +++++++++++++---
 src/assets/style/theme/theme.scss             | 10 +++++
 .../core/d2-multiple-page-control/index.vue   | 44 +++++++++++++------
 3 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 95ec8d2c..cf8423eb 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -165,19 +165,46 @@
         .d2-theme-container-main-header {
           flex-grow: 0;
           // 多页面控制器
-          .d2-multiple-page-control {
-            .el-tabs__header.is-top {
-              margin: 0px;
-              margin-right: 20px;
+          .d2-multiple-page-control-group {
+            display: flex;
+            margin-right: 20px;
+            .d2-multiple-page-control-content {
+              flex-grow: 1;
+              position: relative;
+              .d2-multiple-page-control-content-inner {
+                position: absolute;
+                left: 0px;
+                right: 0px;
+                .d2-multiple-page-control {
+                  .el-tabs__header.is-top {
+                    margin: 0px;
+                  }
+                  .el-tabs__nav {
+                    overflow: hidden;
+                  }
+                }
+              }
             }
-            .el-tabs__nav {
-              overflow: hidden;
+            .d2-multiple-page-control-btn {
+              position: relative;
+              bottom: -1px;
+              .el-dropdown {
+                .el-button-group {
+                  .el-button:first-child {
+                    border-bottom-left-radius: 0px;
+                  }
+                  .el-button:last-child {
+                    border-bottom-right-radius: 0px;
+                  }
+                }
+              }
             }
           }
         }
         // 主体
         .d2-theme-container-main-body {
           flex-grow: 1;
+          margin-top: 1px;
           position: relative;
           // 布局组件
           .container-component {
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index b147ab7e..0ae8ba93 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -234,6 +234,16 @@
             color: $theme-multiple-page-control-nav-next-color;
           }
         }
+        // 多页控制器的关闭控制
+        .d2-multiple-page-control-btn {
+          .el-dropdown {
+            .el-button-group {
+              .el-button {
+                border-color: $theme-multiple-page-control-border-color;
+              }
+            }
+          }
+        }
       }
       // 主体
       .d2-theme-container-main-body {
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 86dbabee..7b32c9f7 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -1,18 +1,34 @@
 <template>
-  <el-tabs
-    class="d2-multiple-page-control"
-    :value="pageCurrent"
-    type="card"
-    :closable="true"
-    @tab-click="handleClick"
-    @edit="handleTabsEdit">
-    <el-tab-pane
-      v-for="(page, index) in pageOpenedList"
-      :key="index"
-      :label="page.name"
-      :name="page.name">
-    </el-tab-pane>
-  </el-tabs>
+  <div class="d2-multiple-page-control-group">
+    <div class="d2-multiple-page-control-content">
+      <div class="d2-multiple-page-control-content-inner">
+        <el-tabs
+          class="d2-multiple-page-control"
+          :value="pageCurrent"
+          type="card"
+          :closable="true"
+          @tab-click="handleClick"
+          @edit="handleTabsEdit">
+          <el-tab-pane
+            v-for="(page, index) in pageOpenedList"
+            :key="index"
+            :label="page.name"
+            :name="page.name">
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+    <div class="d2-multiple-page-control-btn">
+      <el-dropdown split-button @click="handleClick">
+        <d2-icon name="trash"/>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item>关闭左侧</el-dropdown-item>
+          <el-dropdown-item>关闭右侧</el-dropdown-item>
+          <el-dropdown-item>全部关闭</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
 </template>
 
 <script>