Merge branch 'hotfix/contextmenu-on-close-btn' into develop

Former-commit-id: 10482c766f2867c1436e4c205976a51952f0c170 [formerly 10482c766f2867c1436e4c205976a51952f0c170 [formerly 10482c766f2867c1436e4c205976a51952f0c170 [formerly 10482c766f2867c1436e4c205976a51952f0c170 [formerly f6b1f8f5ad335ec17d9832c2947da4f7f774b072 [formerly 7cc4631adcb11e56d1c333a5beb2e512e4a2747a]]]]]
Former-commit-id: cad358ee0ffc3a6bf72e36c4e8c9d0d09a3591d6
Former-commit-id: 6a55a0d15d23542431c5f594fa8bd3892ec82aac
Former-commit-id: ac40ad5eaa92f5bcf34ced4636a0b57e09322a70 [formerly e0bc3eeb74af2f5d9e308fe62d9815f164f1705e]
Former-commit-id: 6c60414042295ecf2bd61624e04ff7104838feab
Former-commit-id: 06087b5f6e1ea8b1a283d16964a46bef242c5db2
Former-commit-id: d4faceedbec06a481e72eb1c87a2533468021298
Former-commit-id: bdf2c63424524df7fd506d9074c4d49c16c0dd17
Former-commit-id: 712173f66061edbad89c087a2d4bbf5df06508a1
This commit is contained in:
liyang
2018-08-04 07:23:26 +08:00

View File

@@ -99,6 +99,11 @@ 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
}
if (target.className.indexOf('el-tabs__item') > -1 || target.parentNode.className.indexOf('el-tabs__item') > -1) {
event.preventDefault()
event.stopPropagation()