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