sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

修复问题issue44，45，46

Browse Source 
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
This commit is contained in:
Lu Chaohai
2018-08-04 18:00:02 +08:00
parent 745a51b106
commit d824b1c82a
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/style/fixed/element.scss
View File

@@ -13,4 +13,8 @@
.el-menu--horizontal { .el-menu--horizontal {
border-bottom: none !important; border-bottom: none !important;
}
.el-tabs__item:focus.is-active.is-focus:not(:active) {
box-shadow: none !important;
} }

2
src/layout/header-aside/components/contextmenu/index.vue
View File

@@ -47,7 +47,7 @@ export default {
}, },
methods: { methods: {
watchContextmenu (event) { 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) window.removeEventListener('mousedown', this.watchContextmenu)
} }
}, },

12
src/layout/header-aside/components/tabs/index.vue
View File

@@ -99,12 +99,16 @@ export default {
*/ */
handleContextmenu (event) { handleContextmenu (event) {
let target = event.target let target = event.target
// 解决 https://github.com/d2-projects/d2-admin/issues/54 // 解决 https://github.com/d2-projects/d2-admin/issues/54
const attribute = target.getAttribute('aria-controls') let flag = false
if (attribute === null) { if (target.className.indexOf('el-tabs__item') > -1) flag = true
return 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.preventDefault()
event.stopPropagation() event.stopPropagation()
this.contentmenuX = event.clientX this.contentmenuX = event.clientX