From 2efa1849a4d12ac7034f5d3d006f41ab113ac557 Mon Sep 17 00:00:00 2001
From: Lu Chaohai <luchaohai@cn.ibm.com>
Date: Sat, 4 Aug 2018 18:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90=E7=89=88?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84issue54=EF=BC=8C55=EF=BC=8C56?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 74894882e9a2b12917de159b0be4af84c9604eda
---
 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 f627560..3f71748 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 422b93b..1dd8a63 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 bfa2ae9..9111f38 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