Browse Source

fix(nc-gui): single select behaviours based on roles

pull/4803/head
Wing-Kam Wong 2 years ago
parent
commit
2c6521c7e4
  1. 39
      packages/nc-gui/components/cell/SingleSelect.vue

39
packages/nc-gui/components/cell/SingleSelect.vue

@ -14,6 +14,7 @@ import {
extractSdkResponseErrorMsg, extractSdkResponseErrorMsg,
inject, inject,
ref, ref,
useRoles,
useSelectedCellKeyupListener, useSelectedCellKeyupListener,
watch, watch,
} from '#imports' } from '#imports'
@ -49,6 +50,8 @@ const searchVal = ref()
const { getMeta } = useMetas() const { getMeta } = useMetas()
const { hasRole } = useRoles()
const { isPg, isMysql } = useProject() const { isPg, isMysql } = useProject()
// a variable to keep newly created option value // a variable to keep newly created option value
@ -73,6 +76,10 @@ const isOptionMissing = computed(() => {
return (options.value ?? []).every((op) => op.title !== searchVal.value) return (options.value ?? []).every((op) => op.title !== searchVal.value)
}) })
const hasEditRoles = computed(() => hasRole('owner', true) || hasRole('creator', true) || hasRole('editor', true))
const editAllowed = computed(() => hasEditRoles.value && (active.value || editable.value))
const vModel = computed({ const vModel = computed({
get: () => tempSelectedOptState.value ?? modelValue, get: () => tempSelectedOptState.value ?? modelValue,
set: (val) => { set: (val) => {
@ -87,10 +94,12 @@ const vModel = computed({
}) })
watch(isOpen, (n, _o) => { watch(isOpen, (n, _o) => {
if (!n) { if (editAllowed.value) {
aselect.value?.$el?.querySelector('input')?.blur() if (!n) {
} else { aselect.value?.$el?.querySelector('input')?.blur()
aselect.value?.$el?.querySelector('input')?.focus() } else {
aselect.value?.$el?.querySelector('input')?.focus()
}
} }
}) })
@ -100,11 +109,15 @@ useSelectedCellKeyupListener(active, (e) => {
isOpen.value = false isOpen.value = false
break break
case 'Enter': case 'Enter':
if (active.value && !isOpen.value) { if (editAllowed.value && active.value && !isOpen.value) {
isOpen.value = true isOpen.value = true
} }
break break
default: default:
if (!editAllowed.value) {
e.preventDefault()
break
}
// toggle only if char key pressed // toggle only if char key pressed
if (!(e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) && e.key?.length === 1) { if (!(e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) && e.key?.length === 1) {
e.stopPropagation() e.stopPropagation()
@ -174,7 +187,7 @@ const toggleMenu = (e: Event) => {
vModel.value = '' vModel.value = ''
return return
} }
isOpen.value = (active.value || editable.value) && !isOpen.value isOpen.value = editAllowed.value && !isOpen.value
} }
</script> </script>
@ -183,11 +196,12 @@ const toggleMenu = (e: Event) => {
ref="aselect" ref="aselect"
v-model:value="vModel" v-model:value="vModel"
class="w-full" class="w-full"
:allow-clear="!column.rqd && active" :class="{ 'caret-transparent': !hasEditRoles }"
:allow-clear="!column.rqd && editAllowed"
:bordered="false" :bordered="false"
:open="isOpen && (active || editable)" :open="isOpen"
:disabled="readOnly" :disabled="readOnly"
:show-arrow="!readOnly && (active || editable || vModel === null)" :show-arrow="hasEditRoles && !readOnly && (editable || (active && vModel === null))"
:dropdown-class-name="`nc-dropdown-single-select-cell ${isOpen ? 'active' : ''}`" :dropdown-class-name="`nc-dropdown-single-select-cell ${isOpen ? 'active' : ''}`"
show-search show-search
@select="isOpen = false" @select="isOpen = false"
@ -216,8 +230,11 @@ const toggleMenu = (e: Event) => {
</span> </span>
</a-tag> </a-tag>
</a-select-option> </a-select-option>
<a-select-option
<a-select-option v-if="searchVal && isOptionMissing && !isPublic" :key="searchVal" :value="searchVal"> v-if="searchVal && isOptionMissing && !isPublic && (hasRole('owner', true) || hasRole('creator', true))"
:key="searchVal"
:value="searchVal"
>
<div class="flex gap-2 text-gray-500 items-center h-full"> <div class="flex gap-2 text-gray-500 items-center h-full">
<MdiPlusThick class="min-w-4" /> <MdiPlusThick class="min-w-4" />
<div class="text-xs whitespace-normal"> <div class="text-xs whitespace-normal">

Loading…
Cancel
Save