From 4241156903025e2d9a722dfdb7dc5ad68ac66d06 Mon Sep 17 00:00:00 2001 From: iczer <1126263215@qq.com> Date: Thu, 6 Aug 2020 16:18:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20the=20problem=20that=20v-auth=20directiv?= =?UTF-8?q?e=20doesn't=20take=20effect=20in=20native=20html=20element;=20:?= =?UTF-8?q?bug:=20=E4=BF=AE=E5=A4=8D=EF=BC=9Av-auth=20=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E5=9C=A8=E5=8E=9F=E7=94=9F=20HTML=20=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E4=B8=8A=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=20bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/authority-plugin.js | 37 ++++++++++++++++++--------------- src/utils/routerUtil.js | 3 +++ 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/plugins/authority-plugin.js b/src/plugins/authority-plugin.js index 860b1d5..7c40aad 100644 --- a/src/plugins/authority-plugin.js +++ b/src/plugins/authority-plugin.js @@ -42,33 +42,33 @@ const auth = function(authConfig, permission, role, permissions, roles) { return false } -/** - * 阻止的 click 事件监听 - * @param event - * @returns {boolean} - */ -const preventClick = function (event) { - event.preventDefault() - event.stopPropagation() - return false -} - const checkInject = function (el, binding,vnode) { const type = binding.arg const check = binding.value const instance = vnode.context const $auth = instance.$auth if (!$auth || !$auth(check, type)) { - el.classList.add('disabled') - el.setAttribute('title', '无此权限') - el.addEventListener('click', preventClick, true) + addDisabled(el) } else { - el.classList.remove('disabled') - el.removeAttribute('title') - el.removeEventListener('click', preventClick, true) + removeDisabled(el) } } +const addDisabled = function (el) { + if (el.tagName === 'BUTTON') { + el.setAttribute('disabled', 'disabled') + } else { + el.classList.add('disabled') + } + el.setAttribute('title', '无此权限') +} + +const removeDisabled = function (el) { + el.classList.remove('disabled') + el.removeAttribute('disabled') + el.removeAttribute('title') +} + const AuthorityPlugin = { install(Vue) { Vue.directive('auth', { @@ -77,6 +77,9 @@ const AuthorityPlugin = { }, update(el, binding,vnode) { checkInject(el, binding, vnode) + }, + unbind(el) { + removeDisabled(el) } }) Vue.mixin({ diff --git a/src/utils/routerUtil.js b/src/utils/routerUtil.js index 795f0cc..0a88cfb 100644 --- a/src/utils/routerUtil.js +++ b/src/utils/routerUtil.js @@ -36,6 +36,9 @@ function parseRoutes(routesConfig, routerMap) { page: routeCfg.page || router.page } } + if (routeCfg.invisible || router.invisible) { + route.meta.invisible = true + } if (routeCfg.children && routeCfg.children.length > 0) { route.children = parseRoutes(routeCfg.children, routerMap) }