Merge branch 'develop'

Former-commit-id: 3b365f371d19d27f70b1a305e9fd0cbef2bdd4b1 [formerly 12c91e77ed0809cd411f9a716843248a5487b994] [formerly 3b365f371d19d27f70b1a305e9fd0cbef2bdd4b1 [formerly 12c91e77ed0809cd411f9a716843248a5487b994] [formerly 3b365f371d19d27f70b1a305e9fd0cbef2bdd4b1 [formerly 12c91e77ed0809cd411f9a716843248a5487b994] [formerly 12c91e77ed0809cd411f9a716843248a5487b994 [formerly ff8fb309431460aa21947ec90b9a4e1341bac60d [formerly bcf10a6a8794d33e96a4d59c59333a7dcc172a0f]]]]]
Former-commit-id: fd2198cad210f0f711a0e635ee50f0c7e4ca2a1c
Former-commit-id: eafb3fea58c8f8d7c86fb620576eefe82bfdf519
Former-commit-id: d5f301eb0bd644ed61aa6d036b30efe7cd7f3587 [formerly e617e2b3be93a1b26f3df3716afb6a56e6cecc32]
Former-commit-id: e6bad860f47dfab4c5cc1f7d01497070f3d52225
Former-commit-id: 387fd7e2f9235728cef2a358062f4c44b07a43a2
Former-commit-id: d86efe02e91b0cd73ae632f6d382572bd79a7e3b
Former-commit-id: d3993e6d5ac68921718640176de2d76124359370
Former-commit-id: 3b7d9b97c8464cabbc0595fd4d741f4bc0cc48e3

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;
 }

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)
     }
   },

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