diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue index 3ed857ab28..31e59ff727 100644 --- a/packages/nc-gui/components/cell/User.vue +++ b/packages/nc-gui/components/cell/User.vue @@ -2,6 +2,7 @@ import { onUnmounted } from '@vue/runtime-core' import tinycolor from 'tinycolor2' import type { Select as AntSelect } from 'ant-design-vue' +import type { UserFieldRecordType } from 'nocodb-sdk' import { ActiveCellInj, CellClickHookInj, @@ -25,7 +26,7 @@ import { import MdiCloseCircle from '~icons/mdi/close-circle' interface Props { - modelValue?: { id: string; email: string; display_name: string }[] | string | null + modelValue?: UserFieldRecordType[] | string | null rowIndex?: number location?: 'cell' | 'filter' forceMulti?: boolean @@ -75,14 +76,15 @@ const searchVal = ref() const { isUIAllowed } = useRoles() -const options = computed<{ id: string; email: string; display_name: string }[]>(() => { - const collaborators: { id: string; email: string; display_name: string }[] = [] +const options = computed(() => { + const collaborators: UserFieldRecordType[] = [] collaborators.push( ...(baseUsers.value?.map((user: any) => ({ id: user.id, email: user.email, display_name: user.display_name, + deleted: user.deleted, })) || []), ) return collaborators @@ -309,28 +311,29 @@ const filterOption = (input: string, option: any) => { - - - - {{ op.display_name?.length ? op.display_name : op.email }} - - - +