-
Notifications
You must be signed in to change notification settings - Fork 3.2k
fix: adjust permission dropdown behavior #12774
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,202 @@ | ||
| <template> | ||
| <el-dropdown-item v-bind="$attrs" :disabled="computedDisabled"> | ||
| <slot></slot> | ||
| </el-dropdown-item> | ||
| <li | ||
| ref="itemRef" | ||
| v-bind="itemAttrs" | ||
| data-el-collection-item | ||
| :aria-disabled="computedDisabled" | ||
| :class="itemClass" | ||
| :style="attrs.style" | ||
| :tabindex="tabIndex" | ||
| :role="role" | ||
| @click="handleClick" | ||
| @focus="handleFocus" | ||
| @keydown.self="handleKeydown" | ||
| @mousedown="handleMousedown" | ||
| @pointermove="handlePointerMove" | ||
| @pointerleave="handlePointerLeave" | ||
| > | ||
| <el-icon v-if="icon || $slots.icon"> | ||
| <slot name="icon"> | ||
| <component :is="icon" /> | ||
| </slot> | ||
| </el-icon> | ||
| <slot /> | ||
| </li> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { computed, ref } from 'vue'; | ||
| import { hasManagePermissionAccess, type PermissionBindingValue } from '@/utils/permission'; | ||
| import { DROPDOWN_INJECTION_KEY, EVENT_CODE } from 'element-plus'; | ||
| import { COLLECTION_ITEM_SIGN } from 'element-plus/es/components/collection/index.mjs'; | ||
| import { | ||
| ROVING_FOCUS_COLLECTION_INJECTION_KEY, | ||
| ROVING_FOCUS_GROUP_INJECTION_KEY, | ||
| } from 'element-plus/es/components/roving-focus-group/index.mjs'; | ||
| import { computed, getCurrentInstance, inject, onBeforeUnmount, onMounted, ref, useAttrs } from 'vue'; | ||
|
|
||
| defineOptions({ | ||
| name: 'FuDropdownItem', | ||
| inheritAttrs: false, | ||
| }); | ||
|
|
||
| const props = defineProps({ | ||
| command: { | ||
| type: [Object, String, Number], | ||
| default: () => ({}), | ||
| }, | ||
| disabled: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| permission: { | ||
| type: [String, Array], | ||
| default: undefined, | ||
| divided: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| textValue: String, | ||
| icon: { | ||
| type: [String, Object, Function], | ||
| }, | ||
| }); | ||
|
|
||
| const emit = defineEmits(['click', 'pointermove', 'pointerleave']); | ||
|
|
||
| const attrs = useAttrs(); | ||
| const itemRef = ref<HTMLElement>(); | ||
| const permissionDisabled = ref(false); | ||
| const instance = getCurrentInstance(); | ||
| const itemId = `fu-dropdown-item-${instance?.uid ?? Math.random().toString(36).slice(2)}`; | ||
|
|
||
| const dropdownContext = inject<any>(DROPDOWN_INJECTION_KEY, undefined); | ||
| const collectionContext = inject<any>(ROVING_FOCUS_COLLECTION_INJECTION_KEY, undefined); | ||
| const rovingFocusContext = inject<any>(ROVING_FOCUS_GROUP_INJECTION_KEY, undefined); | ||
|
|
||
| const computedDisabled = computed(() => props.disabled || permissionDisabled.value); | ||
|
|
||
| const itemAttrs = computed(() => { | ||
| return Object.fromEntries(Object.entries(attrs).filter(([key]) => key !== 'class' && key !== 'style')); | ||
| }); | ||
|
|
||
| const itemClass = computed(() => [ | ||
| attrs.class, | ||
| 'el-dropdown-menu__item', | ||
| { | ||
| 'el-dropdown-menu__item--divided': props.divided, | ||
| 'is-disabled': computedDisabled.value, | ||
| 'fu-dropdown-item--permission-disabled': computedDisabled.value, | ||
| }, | ||
| ]); | ||
|
|
||
| const tabIndex = computed(() => (rovingFocusContext?.currentTabbedId?.value === itemId ? 0 : -1)); | ||
|
|
||
| const role = computed(() => { | ||
| const menuRole = dropdownContext?.role?.value; | ||
| if (menuRole === 'menu') { | ||
| return 'menuitem'; | ||
| } | ||
| if (menuRole === 'navigation') { | ||
| return 'link'; | ||
| } | ||
| return 'button'; | ||
| }); | ||
|
|
||
| const hasPermission = computed(() => hasManagePermissionAccess(props.permission as PermissionBindingValue)); | ||
| const handleMousedown = (event: MouseEvent) => { | ||
| if (computedDisabled.value) { | ||
| event.preventDefault(); | ||
| return; | ||
| } | ||
| rovingFocusContext?.onItemFocus?.(itemId); | ||
| }; | ||
|
|
||
| const computedDisabled = computed(() => props.disabled || permissionDisabled.value || !hasPermission.value); | ||
| const handleFocus = () => { | ||
| rovingFocusContext?.onItemFocus?.(itemId); | ||
| }; | ||
|
|
||
| const handleKeydown = (event: KeyboardEvent) => { | ||
| if ([EVENT_CODE.enter, EVENT_CODE.numpadEnter, EVENT_CODE.space].includes(event.code)) { | ||
| event.preventDefault(); | ||
| event.stopImmediatePropagation(); | ||
| handleClick(event); | ||
| return; | ||
| } | ||
|
|
||
| if (event.code === EVENT_CODE.tab && event.shiftKey) { | ||
| rovingFocusContext?.onItemShiftTab?.(); | ||
| return; | ||
| } | ||
| rovingFocusContext?.onKeydown?.(event); | ||
| }; | ||
|
|
||
| const handleClick = (event: Event) => { | ||
| if (computedDisabled.value) { | ||
| event.stopImmediatePropagation(); | ||
| return; | ||
| } | ||
|
|
||
| emit('click', event); | ||
| if (event.type !== 'keydown' && event.defaultPrevented) { | ||
| return; | ||
| } | ||
|
|
||
| if (dropdownContext?.hideOnClick?.value) { | ||
| dropdownContext.handleClick?.(); | ||
| } | ||
| dropdownContext?.commandHandler?.(props.command, instance, event); | ||
| }; | ||
|
|
||
| const handlePointerMove = (event: PointerEvent) => { | ||
| emit('pointermove', event); | ||
| if (event.pointerType !== 'mouse') { | ||
| return; | ||
| } | ||
| if (computedDisabled.value) { | ||
| dropdownContext?.onItemLeave?.(event); | ||
| return; | ||
| } | ||
|
|
||
| const target = event.currentTarget as HTMLElement; | ||
| if (target === document.activeElement || target.contains(document.activeElement)) { | ||
| return; | ||
| } | ||
|
|
||
| dropdownContext?.onItemEnter?.(event); | ||
| if (!event.defaultPrevented) { | ||
| target.focus({ preventScroll: true }); | ||
| } | ||
| }; | ||
|
|
||
| const handlePointerLeave = (event: PointerEvent) => { | ||
| emit('pointerleave', event); | ||
| if (event.pointerType === 'mouse') { | ||
| dropdownContext?.onItemLeave?.(event); | ||
| } | ||
| }; | ||
|
|
||
| onMounted(() => { | ||
| if (!itemRef.value) { | ||
| return; | ||
| } | ||
| collectionContext?.itemMap?.set(itemRef.value, { | ||
| ref: itemRef.value, | ||
| ...attrs, | ||
| [COLLECTION_ITEM_SIGN]: '', | ||
| }); | ||
| }); | ||
|
|
||
| onBeforeUnmount(() => { | ||
| if (itemRef.value) { | ||
| collectionContext?.itemMap?.delete(itemRef.value); | ||
| } | ||
| }); | ||
|
|
||
| defineExpose({ | ||
| setPermissionDisabled: (disabled: boolean) => { | ||
| permissionDisabled.value = disabled; | ||
| }, | ||
| }); | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| .fu-dropdown-item--permission-disabled { | ||
| opacity: 0.45; | ||
| cursor: not-allowed; | ||
| } | ||
| </style> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a user only has view permission,
v-permissiondisables theStatusbutton but the dropdown trigger is still attached to the wrapping component/root, so the hover dropdown can still open. These replacementel-dropdown-items no longer havev-permission/FuDropdownItem, so any action allowed bycheckStatusremains clickable and callsonOperate, allowing read-only users to start/stop/restart containers from this menu. Keep the permission directive on the action items or disable the dropdown itself for non-manage users.Useful? React with 👍 / 👎.