From d824b1c82a973a3dcd91c223d0f87508e4af6e36 Mon Sep 17 00:00:00 2001
From: Lu Chaohai <luchaohai@cn.ibm.com>
Date: Sat, 4 Aug 2018 18:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98issue44?=
 =?UTF-8?q?=EF=BC=8C45=EF=BC=8C46?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 5c692da9331ee18f28dc4ed82e893fd3edf0b59e [formerly 5c876723e46ba5e9bd3e6b08ca26838281b9fe70]]]]]
Former-commit-id: 1be81527166d59028564eef5f3bad3433e170cdc
Former-commit-id: 3224de37c64ffb4080cbe40b2796b0460b269c78
Former-commit-id: 27624807993595ddabacea5f80a8d92787ddd49c [formerly d0d1585c512c7ef2a2ce66ad7c3e7309c908a08e]
Former-commit-id: 9fa0e8942ff590152d29c2cb2a872baf116e0271
Former-commit-id: e30298941ab3eb1661f567dc37c10cdd27238004
Former-commit-id: 239a341eb2dc0adc7e2aa82acaadfa3a1f48d954
Former-commit-id: 49ae60f02ff7683f17d6375ce2249f3b19f5e8cf
Former-commit-id: b0be7cf952884e67c4d8509272cb9205ab134644
---
 src/assets/style/fixed/element.scss                  |  4 ++++
 .../header-aside/components/contextmenu/index.vue    |  2 +-
 src/layout/header-aside/components/tabs/index.vue    | 12 ++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/assets/style/fixed/element.scss b/src/assets/style/fixed/element.scss
index f627560b..3f717487 100644
--- a/src/assets/style/fixed/element.scss
+++ b/src/assets/style/fixed/element.scss
@@ -13,4 +13,8 @@
 
 .el-menu--horizontal {
   border-bottom: none !important;
+}
+
+.el-tabs__item:focus.is-active.is-focus:not(:active) {
+  box-shadow: none !important;
 }
\ No newline at end of file
diff --git a/src/layout/header-aside/components/contextmenu/index.vue b/src/layout/header-aside/components/contextmenu/index.vue
index 422b93b2..1dd8a63b 100644
--- a/src/layout/header-aside/components/contextmenu/index.vue
+++ b/src/layout/header-aside/components/contextmenu/index.vue
@@ -47,7 +47,7 @@ export default {
   },
   methods: {
     watchContextmenu (event) {
-      if (!this.$el.contains(event.target)) this.flag = false
+      if (!this.$el.contains(event.target) || event.button !== 0) 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 bfa2ae9e..9111f38b 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -99,12 +99,16 @@ export default {
      */
     handleContextmenu (event) {
       let target = event.target
+
       // 解决 https://github.com/d2-projects/d2-admin/issues/54
-      const attribute = target.getAttribute('aria-controls')
-      if (attribute === null) {
-        return
+      let flag = false
+      if (target.className.indexOf('el-tabs__item') > -1) flag = true
+      else if (target.parentNode.className.indexOf('el-tabs__item') > -1) {
+        target = target.parentNode
+        flag = true
       }
-      if (target.className.indexOf('el-tabs__item') > -1 || target.parentNode.className.indexOf('el-tabs__item') > -1) {
+
+      if (flag) {
         event.preventDefault()
         event.stopPropagation()
         this.contentmenuX = event.clientX