From 8230c5562902df789aa4568a76e075f4464c3f8b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 1 Aug 2018 16:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly 036ab14e128b321b4a4f17972e276cffb62b4cf1 [formerly d24e01dcd8ef7f71d7e4b2f3e01b5b5b5f0d69de]]]]]
Former-commit-id: f5fc086d537466936ac404d4640381a99b9700e9
Former-commit-id: 8da9ee34c4814c6880e8cbb17a1c8f3c901c11f6
Former-commit-id: 074ba19730618a3f4e68ad553a5aa363efe5a21f [formerly 596f38d6e42274034b180513447dcf7bcacef2b3]
Former-commit-id: af1c1e83fc7e2136a1209548ce2f7dc49023847d
Former-commit-id: b3e4c457de4dabd533a2bd0df8723bf4b82a09b7
Former-commit-id: 073a989e801e02ccf52b67eb8e93fc512c021447
Former-commit-id: d7dee6ae60cadd4655536af792089ea468657033
Former-commit-id: e4c72e70c50356888fbeeebf4c92f4418dd97359
---
 .../components/contentmenuList/index.vue      | 22 ++++++++--
 .../components/contextmenu/index.vue          |  9 ++--
 .../header-aside/components/tabs/index.vue    | 43 +++++++------------
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
index d8deb488..d3ce5f40 100644
--- a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
+++ b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
@@ -1,14 +1,28 @@
 <template>
-  <div class="d2-contentmenu-list" @click="rowClick">
-    <div class="d2-contentmenu-item" flex="cross:center main:center" v-for="item in menulist" :key="item.value" :data-value="item.value">
-      <d2-icon v-if="item.icon" :name="item.icon"/>
-      <div class="d2-contentmenu-item-title" flex-box="1">{{item.title}}</div>
+  <div
+    class="d2-contentmenu-list"
+    @click="rowClick">
+    <div
+      v-for="item in menulist"
+      :key="item.value"
+      :data-value="item.value"
+      class="d2-contentmenu-item"
+      flex="cross:center main:center">
+      <d2-icon
+        v-if="item.icon"
+        :name="item.icon"/>
+      <div
+        class="d2-contentmenu-item-title"
+        flex-box="1">
+        {{item.title}}
+      </div>
     </div>
   </div>
 </template>
 
 <script>
   export default {
+    name: 'd2-contextmenu-list',
     props: {
       menulist: {
         type: Array,
diff --git a/src/layout/header-aside/components/contextmenu/index.vue b/src/layout/header-aside/components/contextmenu/index.vue
index 12aa07c4..422b93b2 100644
--- a/src/layout/header-aside/components/contextmenu/index.vue
+++ b/src/layout/header-aside/components/contextmenu/index.vue
@@ -1,6 +1,9 @@
 <template>
-  <div class="d2-contextmenu" v-show="flag" :style="style">
-    <slot />
+  <div
+    class="d2-contextmenu"
+    v-show="flag"
+    :style="style">
+    <slot/>
   </div>
 </template>
 
@@ -38,7 +41,7 @@ export default {
       return {
         left: this.x + 'px',
         top: this.y + 'px',
-        display: this.visible === true ? 'block' : 'none '
+        display: this.visible ? 'block' : 'none '
       }
     }
   },
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 97491e59..c6e7ea53 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -7,7 +7,7 @@
           :x="contentmenuX"
           :y="contentmenuY">
           <d2-contextmenu-list
-            :menulist="contextmenuList"
+            :menulist="tagName === 'index' ? contextmenuListIndex : contextmenuList"
             @rowClick="contextmenuClick"/>
         </d2-contextmenu>
         <el-tabs
@@ -27,7 +27,9 @@
         </el-tabs>
       </div>
     </div>
-    <div class="d2-multiple-page-control-btn" flex-box="0">
+    <div
+      class="d2-multiple-page-control-btn"
+      flex-box="0">
       <el-dropdown
         split-button
         @click="handleControlBtnClick"
@@ -58,39 +60,24 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex'
-import D2Contextmenu from '../contextmenu'
-import D2ContextmenuList from '../contextmenu/components/contentmenuList'
 export default {
   components: {
-    D2Contextmenu,
-    D2ContextmenuList
+    D2Contextmenu: () => import('../contextmenu'),
+    D2ContextmenuList: () => import('../contextmenu/components/contentmenuList')
   },
   data () {
     return {
       contextmenuFlag: false,
       contentmenuX: 0,
       contentmenuY: 0,
+      contextmenuListIndex: [
+        { icon: 'times-circle', title: '关闭全部', value: 'all' }
+      ],
       contextmenuList: [
-        {
-          icon: 'arrow-left',
-          title: '关闭左侧',
-          value: 'left'
-        },
-        {
-          icon: 'arrow-right',
-          title: '关闭右侧',
-          value: 'right'
-        },
-        {
-          icon: 'times',
-          title: '关闭其它',
-          value: 'other'
-        },
-        {
-          icon: 'times-circle',
-          title: '关闭全部',
-          value: 'all'
-        }
+        { icon: 'arrow-left', title: '关闭左侧', value: 'left' },
+        { icon: 'arrow-right', title: '关闭右侧', value: 'right' },
+        { icon: 'times', title: '关闭其它', value: 'other' },
+        { icon: 'times-circle', title: '关闭全部', value: 'all' }
       ],
       tagName: 'index'
     }
@@ -132,7 +119,9 @@ export default {
      * @description 接收点击关闭控制上选项的事件
      */
     handleControlItemClick (command, tagName = null) {
-      if (tagName) this.contextmenuFlag = false
+      if (tagName) {
+        this.contextmenuFlag = false
+      }
       const params = {
         pageSelect: tagName,
         vm: this