From 85ff55029aea00998a3e10dd5067dea6749071af Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 13 Jul 2018 21:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=82=BC=E5=85=AC=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 278f2272b7aba737b5b3c49b621f3cc00a2a150c [formerly 278f2272b7aba737b5b3c49b621f3cc00a2a150c [formerly 278f2272b7aba737b5b3c49b621f3cc00a2a150c [formerly 278f2272b7aba737b5b3c49b621f3cc00a2a150c [formerly 80c5397e852a3591eb6d5f8ea6bb6a2d90e03fb8 [formerly 47d97d4d5741cfd6e23f282d6594e51bc150a621]]]]]
Former-commit-id: 5fc3fc935765addc6a7fa782a445e814232efa4e
Former-commit-id: 3f9539bae4c59d3fa7ebbf8f8ff0aeeeba5ff10a
Former-commit-id: 60d9cda4fcbf4bdbe9c07a0581cd1ccaa07e4fa0 [formerly 3b54a6f6dbaa5596c726eabd195673352683dfb6]
Former-commit-id: 4e844aa5cc7e264914eda04efc151b39f7f744db
Former-commit-id: 70a7aed8d8514dcb7e933997167f5e95186a859a
Former-commit-id: 481e5d5540367905e9216d9473a378d7b9db0da7
Former-commit-id: 836c189615ae01df385ec3d5473f1b65d571a4ef
Former-commit-id: 69cb56832d34116ce3e4cfdd29c036153fa0aa5a
---
 .../core/d2-multiple-page-control/index.vue   | 59 +++++++++----------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index c89c1e6d..79d2d2e9 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 export default {
   data () {
     return {
@@ -62,33 +62,38 @@ export default {
     })
   },
   methods: {
+    ...mapMutations([
+      'd2adminTagCloseLeft',
+      'd2adminTagCloseRight',
+      'd2adminTagCloseOther',
+      'd2adminTagCloseAll'
+    ]),
     /**
      * @description 接收点击关闭控制上选项的事件
      */
     handleControlItemClick (command) {
       switch (command) {
         case 'left':
-          this.closeAllTagLeft()
+          this.handleCloseAllTagLeft()
           break
         case 'right':
-          this.closeAllTagRight()
+          this.handleCloseAllTagRight()
           break
         case 'other':
-          this.closeAllTagOther()
+          this.handleCloseAllTagOther()
           break
         case 'all':
-          this.closeAllTag()
+          this.handleCloseAllTag()
           break
         default:
-          console.log('无效指令')
+          this.$message.error('无效的操作')
           break
       }
     },
     /**
-     * @description 接收点击关闭控制上按钮的事件
+     * @description 接收点击关闭控制上按钮的事件 暂时这个按钮还只有关闭全部标签的功能
      */
     handleControlBtnClick () {
-      // 关闭所有
       this.closeAllTag()
     },
     /**
@@ -116,26 +121,26 @@ export default {
     /**
      * @description 关闭左侧的 tag
      */
-    closeAllTagLeft () {
-      this.$store.commit('d2adminTagCloseLeft')
+    handleCloseAllTagLeft () {
+      this.d2adminTagCloseLeft()
     },
     /**
      * @description 关闭右侧的 tag
      */
-    closeAllTagRight () {
-      this.$store.commit('d2adminTagCloseRight')
+    handleCloseAllTagRight () {
+      this.d2adminTagCloseRight()
     },
     /**
      * @description 关闭其它的 tag
      */
-    closeAllTagOther () {
-      this.$store.commit('d2adminTagCloseOther')
+    handleCloseAllTagOther () {
+      this.d2adminTagCloseOther()
     },
     /**
      * @description 关闭全部的 tag
      */
-    closeAllTag () {
-      this.$store.commit('d2adminTagCloseAll', this)
+    handleCloseAllTag () {
+      this.d2adminTagCloseAll(this)
     },
     /**
      * @description 关闭一个指定的 tag
@@ -157,25 +162,17 @@ export default {
             break
           }
         }
-      } else {
-        // 关闭的页面不是当前的页面
-        // 这里暂时不需要做什么
       }
       this.$store.commit('d2adminTagClose', tagName)
       if (this.pageCurrent === tagName) {
-        this.linkTo(newPage)
+        const { name = '', argu = {}, query = {} } = newPage
+        let routerObj = {
+          name,
+          params: argu,
+          query
+        }
+        this.$router.push(routerObj)
       }
-    },
-    /**
-     * @description 跳转到新的页面
-     */
-    linkTo ({ name = '', argu = {}, query = {} }) {
-      let routerObj = {
-        name,
-        params: argu,
-        query
-      }
-      this.$router.push(routerObj)
     }
   }
 }