From ba13e071a6b48294ca6bf7e84f933459bac97f25 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 28 Jan 2019 19:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=B6=E5=AE=83=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2b350f2c7dcabccf81332da56913ed5791b2630b [formerly 2b350f2c7dcabccf81332da56913ed5791b2630b [formerly 2b350f2c7dcabccf81332da56913ed5791b2630b [formerly 2b350f2c7dcabccf81332da56913ed5791b2630b [formerly fd209ad1a484e712fd0ea74ce7020098aead4242 [formerly 2c257cb405ccac096443bd2fdccbaae5b7a7336c]]]]]
Former-commit-id: 434ea68625951aac6b0e831c27c269c4ee3aebf6
Former-commit-id: 9ac8deebf8637bdffe8a0db61c35c76ef2d0072b
Former-commit-id: 16095a553ae10a98e0cbebdad85e31d0208e6326 [formerly eeb61bc0d3c1cce704fde0002c37dedae74b0238]
Former-commit-id: 5ce017604d4ab2d59966ec0506d8169e1d5bedce
Former-commit-id: d31d2b9eacc1a8babee74378e0e94dfd1ac9b2bd
Former-commit-id: 11ef4d394329d103b6092cb54d582e27cf3f55c9
Former-commit-id: 565b6d70b1ccc2315074c7ee0b8a1b12b1aed997
Former-commit-id: 47dc611dc81999519ee3a87706b3beec4d70d414
---
 package.json                                   |  2 +-
 .../header-aside/components/tabs/index.vue     | 13 +++----------
 src/pages/demo/playground/store/page/index.vue | 18 +++++-------------
 .../d2admin/modules/page.js.REMOVED.git-id     |  2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 8204bb4e..da690b1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 39f9f63b..145c33e9 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -32,7 +32,7 @@
       <el-dropdown
         size="default"
         split-button
-        @click="handleControlBtnClick"
+        @click="closeAll"
         @command="command => handleControlItemClick(command)">
         <d2-icon name="times-circle"/>
         <el-dropdown-menu slot="dropdown">
@@ -131,8 +131,7 @@ export default {
         this.contextmenuFlag = false
       }
       const params = {
-        pageSelect: tagName,
-        vm: this
+        pageSelect: tagName
       }
       switch (command) {
         case 'left':
@@ -145,19 +144,13 @@ export default {
           this.closeOther(params)
           break
         case 'all':
-          this.closeAll(this)
+          this.closeAll()
           break
         default:
           this.$message.error('无效的操作')
           break
       }
     },
-    /**
-     * @description 接收点击关闭控制上按钮的事件
-     */
-    handleControlBtnClick () {
-      this.closeAll(this)
-    },
     /**
      * @description 接收点击 tab 标签的事件
      */
diff --git a/src/pages/demo/playground/store/page/index.vue b/src/pages/demo/playground/store/page/index.vue
index c100055e..18f7fc48 100644
--- a/src/pages/demo/playground/store/page/index.vue
+++ b/src/pages/demo/playground/store/page/index.vue
@@ -18,7 +18,7 @@
       <el-button @click="handleCloseOther">
         其它 <d2-icon name="times"/>
       </el-button>
-      <el-button @click="handleCloseAll">
+      <el-button @click="closeAll">
         全部 <d2-icon name="times-circle"/>
       </el-button>
     </el-button-group>
@@ -61,35 +61,27 @@ export default {
     // 关闭当前
     handleCloseCurrent () {
       this.close({
-        tagName: this.$route.fullPath,
-        vm: this
+        tagName: this.$route.fullPath
       })
     },
     // 关闭左侧
     handleCloseLeft () {
       this.closeLeft({
-        tagName: this.$route.fullPath,
-        vm: this
+        tagName: this.$route.fullPath
       })
     },
     // 关闭右侧
     handleCloseRight () {
       this.closeRight({
-        tagName: this.$route.fullPath,
-        vm: this
+        tagName: this.$route.fullPath
       })
     },
     // 关闭其他
     handleCloseOther () {
       this.closeOther({
-        tagName: this.$route.fullPath,
-        vm: this
+        tagName: this.$route.fullPath
       })
     },
-    // 关闭全部
-    handleCloseAll () {
-      this.closeAll(this)
-    },
     // 清空当前页缓存并刷新此页面
     handleCleanCacheAndRefreshCurrent () {
       this.keepAliveRemove(this.$route.fullPath)
diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
index 6a361f7f..e0933f9a 100644
--- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
@@ -1 +1 @@
-d249cb1f50667aeccdfc837b5b2986b0fe6b2dde
\ No newline at end of file
+4b3ff7580fa4e0e1fede736ece71a9455d0ec4fe
\ No newline at end of file