From ba769e6592fc0ddb8ae24b7a5906c55ce611f684 Mon Sep 17 00:00:00 2001
From: Lu Chaohai <luchaohai@cn.ibm.com>
Date: Tue, 31 Jul 2018 21:10:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=AD=A5=EF=BC=9A=E5=AE=9A=E5=88=B6=E8=87=AA=E5=B7=B1=E7=9A=84?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: ce0304d2a56962ad9fe64a12c802c11909457afa [formerly ce0304d2a56962ad9fe64a12c802c11909457afa [formerly ce0304d2a56962ad9fe64a12c802c11909457afa [formerly ce0304d2a56962ad9fe64a12c802c11909457afa [formerly 37d262cdbc810790b833d06503ca0c38d940310c [formerly 2afb0e2f7d7ca0d7ef3df1a34ccbf726786370d6]]]]]
Former-commit-id: 5868cdaeb5da645fd4964e4f8d0375e9bd8df178
Former-commit-id: 3742735054ffd6dea30adab4803c9d4187091467
Former-commit-id: 4907c8e6ed8b8769d5f441076d9e4c65474440d9 [formerly 4dab0307c98aef7e71ba749887fbb95a48b12ed5]
Former-commit-id: 224a72f5de9cdabacdac076fb58516dbca6a0216
Former-commit-id: 6f1576eec600ef6f192850f449ac6b67e71f30e1
Former-commit-id: 095d0f4d404728bb68ee56e4193ad4d53548a119
Former-commit-id: 9da6f4c2e4c0c2ef4f5ae43b34d9ad1c5f0910c0
Former-commit-id: 7b871cd75a69dfea4053644bc8852db779b67fb6
---
 .../components/contextmenu/index.vue          | 67 +++++++++++++++++++
 .../header-aside/components/tabs/index.vue    | 35 +++++++++-
 2 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 src/layout/header-aside/components/contextmenu/index.vue

diff --git a/src/layout/header-aside/components/contextmenu/index.vue b/src/layout/header-aside/components/contextmenu/index.vue
new file mode 100644
index 000000000..deba534dd
--- /dev/null
+++ b/src/layout/header-aside/components/contextmenu/index.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="d2-contextmenu" v-show="flag" :style="style">
+    <slot />
+  </div>
+</template>
+<style>
+  .d2-contextmenu {
+    position: absolute;
+    padding: 5px;
+    z-index: 2018;
+    background: white;
+    border: 1px solid #cfd7e5;
+    border-radius: 3px;
+    box-shadow: 0px 0px 5px #ccc;
+  }
+</style>
+<script>
+export default {
+  name: 'd2-contextmenu',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    x: {
+      type: Number,
+      default: 0
+    },
+    y: {
+      type: Number,
+      default: 0
+    }
+  },
+  computed: {
+    flag: {
+      get () {
+        console.log('change flag')
+        if (this.visible) {
+          // 注册全局监听事件[目前只考虑鼠标解除触发]
+          window.addEventListener('mousedown', this.watchContextmenu)
+        }
+        return this.visible
+      },
+      set (newVal) {
+        this.$emit('update:visible', newVal)
+      }
+    },
+    style () {
+      return {
+        left: this.x + 'px',
+        top: this.y + 'px',
+        display: this.visible === true ? 'block' : 'none '
+      }
+    }
+  },
+  methods: {
+    watchContextmenu () {
+      this.flag = false
+      window.removeEventListener('mousedown', this.watchContextmenu)
+    }
+  },
+  mounted () {
+    // 将菜单放置到body下
+    document.querySelector('body').appendChild(this.$el)
+  }
+}
+</script>
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 8c31778f4..0f91f97ec 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -2,18 +2,24 @@
   <div class="d2-multiple-page-control-group" flex>
     <div class="d2-multiple-page-control-content" flex-box="1">
       <div class="d2-multiple-page-control-content-inner">
+        <d2-contextmenu :visible.sync="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">
+          test
+        </d2-contextmenu>
         <el-tabs
           class="d2-multiple-page-control"
           :value="pageCurrent"
           type="card"
           :closable="true"
           @tab-click="handleClick"
-          @edit="handleTabsEdit">
+          @edit="handleTabsEdit"
+          @contextmenu.native="handleContextmenu">
           <el-tab-pane
+            class="hello"
             v-for="(page, index) in pageOpenedList"
             :key="index"
             :label="page.meta.title || '未命名'"
-            :name="page.name">
+            :name="page.name"
+            >
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -49,7 +55,18 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex'
+import D2Contextmenu from '../contextmenu'
 export default {
+  components: {
+    D2Contextmenu
+  },
+  data () {
+    return {
+      contextmenuFlag: false,
+      contentmenuX: 0,
+      contentmenuY: 0
+    }
+  },
   computed: {
     ...mapState({
       pageOpenedList: state => state.d2admin.pageOpenedList,
@@ -63,6 +80,20 @@ export default {
       'd2adminTagCloseOther',
       'd2adminTagCloseAll'
     ]),
+    /**
+     * @description 右键菜单功能点击
+     */
+    handleContextmenu (event) {
+      let target = event.target
+      if (target.className.indexOf('el-tabs__item') > -1 || target.parentNode.className.indexOf('el-tabs__item') > -1) {
+        event.preventDefault()
+        event.stopPropagation()
+        this.contextmenuFlag = true
+        this.contentmenuX = event.clientX
+        this.contentmenuY = event.clientY
+        console.log(event)
+      }
+    },
     /**
      * @description 接收点击关闭控制上选项的事件
      */

From fbedf5611f7f19af44aff57755442f55dd7a6f7b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 1 Aug 2018 12:56:01 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 0fa9c67f2c5244a9fd0ab3ef7f535ee5dbc17028 [formerly 5fa2a7b6bc4770626ad8dffb3079cc6c2dc9974d]]]]]
Former-commit-id: f30664ca7e509fd1dba988b0b1aafa26d597bc61
Former-commit-id: 7c5b94b5e644651fdb22b718a9510558d085f0e3
Former-commit-id: c73277f2c97cf7997a61be8593d8fa2ba88f00ca [formerly ea6c40ec2b32a4942246411f2840a88e3438bf4e]
Former-commit-id: 92245f6d7266be02d82f33c6fe924d6a3ed39b96
Former-commit-id: 42a7a0188ce77b45fe5f6005031317dede7a2572
Former-commit-id: effd07ee35c835c32458654db48d4e650020eadb
Former-commit-id: cf8765eb3f8f50ec96991ede9fd04705b2285d57
Former-commit-id: 01f9a3207cbd369c1a0776fad94d692471987fc8
---
 docs/.vuepress/config.js                            | 13 ++++++++++---
 docs/zh/article/README.md                           |  4 ++--
 .../combinable-questionnaire.md.REMOVED.git-id      |  1 +
 docs/zh/article/cookbook/what-is-cookbook.md        |  3 +++
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id
 create mode 100644 docs/zh/article/cookbook/what-is-cookbook.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 0e899682a..5ad8e3242 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -52,7 +52,7 @@ module.exports = {
           '/zh/guide/': sideBarGuide('指南'),
           '/zh/plugins/': sideBarPlugins('插件'),
           '/zh/components/': sideBarComponents('组件'),
-          '/zh/article/': sideBarArticle('版本更新'),
+          '/zh/article/': sideBarArticle('Cookbook', '版本更新'),
           '/zh/others/': sideBarOthers('其它')
         }
       }
@@ -109,13 +109,20 @@ function sideBarComponents (title) {
   ]
 }
 
-function sideBarArticle (titleUpdate) {
+function sideBarArticle (titleCookBook, titleUpdate) {
   return [
+    {
+      title: titleCookBook,
+      collapsable: false,
+      children: [
+        'cookbook/what-is-cookbook',
+        'cookbook/combinable-questionnaire',
+      ]
+    },
     {
       title: titleUpdate,
       collapsable: false,
       children: [
-        '',
         'update/1.1.5',
         'update/1.1.4',
         'update/0.0.0'
diff --git a/docs/zh/article/README.md b/docs/zh/article/README.md
index 9dc383cca..37a1c1026 100644
--- a/docs/zh/article/README.md
+++ b/docs/zh/article/README.md
@@ -1,3 +1,3 @@
-# 章节介绍
+# 文章
 
-这个章节下收录关于 D2Admin 的一些介绍，用法，以及每次发布新版本时的推广文章，也是每篇新文章的首发地址。
\ No newline at end of file
+请在侧边栏目录选择文章阅读
\ No newline at end of file
diff --git a/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id b/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id
new file mode 100644
index 000000000..0b0e820e1
--- /dev/null
+++ b/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id
@@ -0,0 +1 @@
+19d478d2f8f1eaf254a2f27de23d407916d28d0d
\ No newline at end of file
diff --git a/docs/zh/article/cookbook/what-is-cookbook.md b/docs/zh/article/cookbook/what-is-cookbook.md
new file mode 100644
index 000000000..53c4758cb
--- /dev/null
+++ b/docs/zh/article/cookbook/what-is-cookbook.md
@@ -0,0 +1,3 @@
+# 什么是 Cookbook
+
+计算机领域的 Cookbook 指的是实用经典案例的意思，是对一些普遍性问题的解决方案的总结和整理。
\ No newline at end of file

From 19410908a83b980c6ac69e812880806351898675 Mon Sep 17 00:00:00 2001
From: Lu Chaohai <luchaohai@cn.ibm.com>
Date: Wed, 1 Aug 2018 13:19:11 +0800
Subject: [PATCH 3/7] =?UTF-8?q?1.=20vuex=E9=87=8C=20=E5=AF=B9d2adminTagClo?=
 =?UTF-8?q?seLeft=EF=BC=8Cd2adminTagCloseRight=EF=BC=8Cd2adminTagCloseOthe?=
 =?UTF-8?q?r=20=E5=81=9A=E4=BA=86=E5=85=BC=E5=AE=B9=E6=80=A7=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0=E3=80=90=E4=BD=BF=E5=BE=97=E4=BD=A0=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E6=97=A0=E5=8F=82=E6=95=B0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=92=8C=E5=8F=82=E6=95=B0=E6=B5=8B=E8=AF=95=E9=83=BD=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E4=BA=86=202.=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAcontentmenuList=E5=81=9A=E5=8F=B3=E9=94=AE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=86=85=E5=AE=B9=E7=9A=84=E6=B8=B2=E6=9F=93=E5=92=8C?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=20=E2=80=94=E2=80=94=20=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=B0=86=E5=8F=82=E6=95=B0=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E5=81=9A=E6=A0=B7=E5=BC=8F=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=88=91=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 4726d045828af2827cbed2da8b673acb7debd71f [formerly a1a2811342e61d0008f9199254070d700fd3b5bc] [formerly 4726d045828af2827cbed2da8b673acb7debd71f [formerly a1a2811342e61d0008f9199254070d700fd3b5bc] [formerly 4726d045828af2827cbed2da8b673acb7debd71f [formerly a1a2811342e61d0008f9199254070d700fd3b5bc] [formerly a1a2811342e61d0008f9199254070d700fd3b5bc [formerly 118b051ea28087166f54eedbf4af330e827f3e9c [formerly e4ec6d960fca41d9fbc5c5247ec2dff051bd52ee]]]]]
Former-commit-id: 81e60a1c9c6f35d4683d6caa8ba1e0fa69f8a2e7
Former-commit-id: fd9303ed5c8c13a87a67ee2b803aab4f45665eca
Former-commit-id: 8cf659c2a6adf39509fd79ecd295bc020ca833a4 [formerly 242bb104727c67d7c5fb3d2861ca3fb09e8c91a4]
Former-commit-id: 2fa2f3625e7db96c90c1dcf2fba4da685f233be8
Former-commit-id: bc7df38e257b2025ce107f09b01292ba256ee94c
Former-commit-id: d07007823fcd159cb496ed0db922e017449a5ea6
Former-commit-id: 72e5cd2e6d9c3293f38fa6eee6fb34b3e6947ad3
Former-commit-id: f704ab58381896ae24c78f6bf677fc9e23c73273
---
 .../components/contentmenuList/index.vue      | 45 ++++++++++++++++
 .../components/contextmenu/index.vue          | 12 ++---
 .../header-aside/components/tabs/index.vue    | 54 +++++++++++++++----
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 4 files changed, 97 insertions(+), 16 deletions(-)
 create mode 100644 src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue

diff --git a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
new file mode 100644
index 000000000..782476783
--- /dev/null
+++ b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
@@ -0,0 +1,45 @@
+<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>
+  </div>
+</template>
+<style lang="scss">
+  .d2-contentmenu-list {
+    .d2-contentmenu-item {
+      padding: 8px 20px;
+      margin: 0;
+      font-size: 14px;
+      color: #606266;
+      cursor: pointer;
+      &:hover {
+        background: #ecf5ff;
+        color: #66b1ff;
+      }
+      .d2-contentmenu-item-title {
+        margin-left: 10px;
+      }
+    }
+  }
+</style>
+<script>
+  export default {
+    props: {
+      menulist: {
+        type: Array,
+        default: () => []
+      }
+    },
+    methods: {
+      rowClick (event) {
+        let target = event.target
+        while(!target.dataset.value) {
+          target = target.parentNode
+        }
+        this.$emit('rowClick', target.dataset.value)
+      }
+    }
+  }
+</script>
diff --git a/src/layout/header-aside/components/contextmenu/index.vue b/src/layout/header-aside/components/contextmenu/index.vue
index deba534dd..c3866ebec 100644
--- a/src/layout/header-aside/components/contextmenu/index.vue
+++ b/src/layout/header-aside/components/contextmenu/index.vue
@@ -6,12 +6,12 @@
 <style>
   .d2-contextmenu {
     position: absolute;
-    padding: 5px;
+    padding: 5px 0;
     z-index: 2018;
     background: white;
-    border: 1px solid #cfd7e5;
-    border-radius: 3px;
-    box-shadow: 0px 0px 5px #ccc;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
   }
 </style>
 <script>
@@ -54,8 +54,8 @@ export default {
     }
   },
   methods: {
-    watchContextmenu () {
-      this.flag = false
+    watchContextmenu (event) {
+      if (!this.$el.contains(event.target)) this.flag = false
       window.removeEventListener('mousedown', this.watchContextmenu)
     }
   },
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 0f91f97ec..f4137be7f 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -3,7 +3,7 @@
     <div class="d2-multiple-page-control-content" flex-box="1">
       <div class="d2-multiple-page-control-content-inner">
         <d2-contextmenu :visible.sync="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">
-          test
+          <d2-contextmenu-list :menulist="contextmenuList" @rowClick="contextmenuClick"></d2-contextmenu-list>
         </d2-contextmenu>
         <el-tabs
           class="d2-multiple-page-control"
@@ -56,15 +56,40 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import D2Contextmenu from '../contextmenu'
+import D2ContextmenuList from '../contextmenu/components/contentmenuList'
 export default {
   components: {
-    D2Contextmenu
+    D2Contextmenu,
+    D2ContextmenuList
   },
   data () {
     return {
       contextmenuFlag: false,
       contentmenuX: 0,
-      contentmenuY: 0
+      contentmenuY: 0,
+      contextmenuList: [
+        {
+          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'
     }
   },
   computed: {
@@ -88,25 +113,36 @@ export default {
       if (target.className.indexOf('el-tabs__item') > -1 || target.parentNode.className.indexOf('el-tabs__item') > -1) {
         event.preventDefault()
         event.stopPropagation()
-        this.contextmenuFlag = true
         this.contentmenuX = event.clientX
         this.contentmenuY = event.clientY
-        console.log(event)
+        this.tagName = target.getAttribute('aria-controls').slice(5)
+        this.contextmenuFlag = true
       }
     },
+    /**
+     * @description 右键菜单的row-click事件
+     */
+    contextmenuClick (command) {
+      this.handleControlItemClick(command, this.tagName)
+    },
     /**
      * @description 接收点击关闭控制上选项的事件
      */
-    handleControlItemClick (command) {
+    handleControlItemClick (command, tagName = null) {
+      if (tagName) this.contextmenuFlag = false
+      const params = {
+        pageSelect: tagName,
+        vm: this
+      }
       switch (command) {
         case 'left':
-          this.d2adminTagCloseLeft()
+          this.d2adminTagCloseLeft(params)
           break
         case 'right':
-          this.d2adminTagCloseRight()
+          this.d2adminTagCloseRight(params)
           break
         case 'other':
-          this.d2adminTagCloseOther()
+          this.d2adminTagCloseOther(params)
           break
         case 'all':
           this.d2adminTagCloseAll(this)
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 3afd8c338..7248e9ce8 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-2b2ad59e01ff445075c4b6d63e425cba12153aec
\ No newline at end of file
+22b6be35e998dbde4cfb9b13b41394742608265b
\ No newline at end of file

From d93b1fe713efa41abe583296dfc958bf6fb02955 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 1 Aug 2018 14:45:08 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly 96a5d8d72a3f9e937749b26b98ee35d8a5e573aa [formerly e8c25342965f77229f3ae09b1fac243c1a1b96a6]]]]]
Former-commit-id: c7983307dda2ddeddac8574313ec1135a39febdf
Former-commit-id: 49ad8b35f28dafdb4b055a41e2967dff8748502e
Former-commit-id: 8eebcd98f050bd9588085210ac5236ab0f4a4aad [formerly b9708f9a2744d5dae714539f4b6c49c74cf932e0]
Former-commit-id: aeee4d28dd59070a70c333ef241be600b35630c1
Former-commit-id: 87f9f9041c9ecf24c362564954bb721e380c482d
Former-commit-id: 888405131e5d3f00003b03e4b825515ba861ccfb
Former-commit-id: e335322b3ba220311531ae6ac5b6736d50a91813
Former-commit-id: ed6d531134acf6ad00f042553357c694597506ac
---
 src/store/modules/d2admin.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 7248e9ce8..2ea59ae88 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-22b6be35e998dbde4cfb9b13b41394742608265b
\ No newline at end of file
+f6b747b5dbf484da5c8b5876c9d54212c90c3550
\ No newline at end of file

From ae8d5ed7d9bf63501d78574c5614fd8e6c588e4b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 1 Aug 2018 15:44:03 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly d13d6e57180fbb88e4d138a10665fa9f74ff9a43 [formerly a287323227fe49f19b1d8924f51e4f0d76f35e63]]]]]
Former-commit-id: 7b479c95b42db5ecea064b78e917c398d09d4786
Former-commit-id: 6fc9a09eae34051907101d998c957d085bdf388c
Former-commit-id: 1be2b7bdfcc7f83b48a7201846cda469b5c464c1 [formerly 9e1cc925f45eee78ea1b7765b58c284067a59bc5]
Former-commit-id: 9486aff65127ee994482ba806adce7fca171310d
Former-commit-id: 9406b9ec706cc4311b1a87c40b8cf4fa5a11e9dd
Former-commit-id: 6ace059932c6865eb91673fb7bf84aca2d822725
Former-commit-id: e159b3d518a4f24602919bbde6dd313c929864e1
Former-commit-id: 09656f37effcf523dbde72b3f31a1be0795ea274
---
 .../components/contentmenuList/index.vue      | 38 ++++++++++---------
 .../components/contextmenu/index.vue          | 27 ++++++-------
 .../header-aside/components/tabs/index.vue    | 13 ++++---
 3 files changed, 42 insertions(+), 36 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 782476783..d8deb488e 100644
--- a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
+++ b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
@@ -6,24 +6,7 @@
     </div>
   </div>
 </template>
-<style lang="scss">
-  .d2-contentmenu-list {
-    .d2-contentmenu-item {
-      padding: 8px 20px;
-      margin: 0;
-      font-size: 14px;
-      color: #606266;
-      cursor: pointer;
-      &:hover {
-        background: #ecf5ff;
-        color: #66b1ff;
-      }
-      .d2-contentmenu-item-title {
-        margin-left: 10px;
-      }
-    }
-  }
-</style>
+
 <script>
   export default {
     props: {
@@ -43,3 +26,22 @@
     }
   }
 </script>
+
+<style lang="scss">
+.d2-contentmenu-list {
+  .d2-contentmenu-item {
+    padding: 8px 20px 8px 15px;
+    margin: 0;
+    font-size: 14px;
+    color: #606266;
+    cursor: pointer;
+    &:hover {
+      background: #ecf5ff;
+      color: #66b1ff;
+    }
+    .d2-contentmenu-item-title {
+      margin-left: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/layout/header-aside/components/contextmenu/index.vue b/src/layout/header-aside/components/contextmenu/index.vue
index c3866ebec..12aa07c47 100644
--- a/src/layout/header-aside/components/contextmenu/index.vue
+++ b/src/layout/header-aside/components/contextmenu/index.vue
@@ -3,17 +3,7 @@
     <slot />
   </div>
 </template>
-<style>
-  .d2-contextmenu {
-    position: absolute;
-    padding: 5px 0;
-    z-index: 2018;
-    background: white;
-    border: 1px solid #ebeef5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-  }
-</style>
+
 <script>
 export default {
   name: 'd2-contextmenu',
@@ -34,9 +24,8 @@ export default {
   computed: {
     flag: {
       get () {
-        console.log('change flag')
         if (this.visible) {
-          // 注册全局监听事件[目前只考虑鼠标解除触发]
+          // 注册全局监听事件 [ 目前只考虑鼠标解除触发 ]
           window.addEventListener('mousedown', this.watchContextmenu)
         }
         return this.visible
@@ -65,3 +54,15 @@ export default {
   }
 }
 </script>
+
+<style>
+.d2-contextmenu {
+  position: absolute;
+  padding: 5px 0;
+  z-index: 2018;
+  background: #FFF;
+  border: 1px solid #cfd7e5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+}
+</style>
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index f4137be7f..97491e59e 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -2,8 +2,13 @@
   <div class="d2-multiple-page-control-group" flex>
     <div class="d2-multiple-page-control-content" flex-box="1">
       <div class="d2-multiple-page-control-content-inner">
-        <d2-contextmenu :visible.sync="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">
-          <d2-contextmenu-list :menulist="contextmenuList" @rowClick="contextmenuClick"></d2-contextmenu-list>
+        <d2-contextmenu
+          :visible.sync="contextmenuFlag"
+          :x="contentmenuX"
+          :y="contentmenuY">
+          <d2-contextmenu-list
+            :menulist="contextmenuList"
+            @rowClick="contextmenuClick"/>
         </d2-contextmenu>
         <el-tabs
           class="d2-multiple-page-control"
@@ -18,9 +23,7 @@
             v-for="(page, index) in pageOpenedList"
             :key="index"
             :label="page.meta.title || '未命名'"
-            :name="page.name"
-            >
-          </el-tab-pane>
+            :name="page.name"/>
         </el-tabs>
       </div>
     </div>

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 6/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?=
 =?UTF-8?q?=E7=BB=9F=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 d8deb488e..d3ce5f407 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 12aa07c47..422b93b2f 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 97491e59e..c6e7ea53d 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

From 8c948f2e82893a22a50f0cfd032102f3fe3f3785 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 1 Aug 2018 22:57:02 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 050000456c1e515edcedbd64527f9b815568b53b [formerly f8db76d25c4f370f65b75f530eead2eec7308486]]]]]
Former-commit-id: 09c61169f2709348cf28d08912c45e40039ac205
Former-commit-id: e83be33bb3ff29f3b200612c25430880b3d1330f
Former-commit-id: b818b75f9e95b4e27065cf027b315203a4af64c5 [formerly ed24a263e5429f8884ca3380d710e0f72bbc4402]
Former-commit-id: 7c95083a9cdf3a34168522c1b069024b5ca618e2
Former-commit-id: 396c3fa37c9b9e16cbe955622c1e45d531a389b8
Former-commit-id: a54a01f89b05c13a2e6719aba6beea2183403b66
Former-commit-id: b9cac170952c0afb7336a818d9e6ca0925d71b6a
Former-commit-id: 167678516b1bc7706002a2ef74d75570bf1db671
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1e3cb7589..5c9368317 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",