Browse Source

fix(gui): single select cell related bugs

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/4957/head
Pranav C 2 years ago
parent
commit
887269d5c1
  1. 7
      packages/nc-gui/components/cell/SingleSelect.vue
  2. 2
      packages/nc-gui/composables/useProject.ts

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

@ -192,6 +192,7 @@ const toggleMenu = (e: Event) => {
</script> </script>
<template> <template>
<div class="h-full w-full flex items-center" @click="toggleMenu">
<a-select <a-select
ref="aselect" ref="aselect"
v-model:value="vModel" v-model:value="vModel"
@ -199,15 +200,14 @@ const toggleMenu = (e: Event) => {
:class="{ 'caret-transparent': !hasEditRoles }" :class="{ 'caret-transparent': !hasEditRoles }"
:allow-clear="!column.rqd && editAllowed" :allow-clear="!column.rqd && editAllowed"
:bordered="false" :bordered="false"
:open="isOpen" :open="isOpen && (active || editable)"
:disabled="readOnly" :disabled="readOnly"
:show-arrow="hasEditRoles && !readOnly && (editable || (active && 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="isOpen && (active || editable)"
@select="isOpen = false" @select="isOpen = false"
@keydown.stop @keydown.stop
@search="search" @search="search"
@click="toggleMenu"
> >
<a-select-option <a-select-option
v-for="op of options" v-for="op of options"
@ -243,6 +243,7 @@ const toggleMenu = (e: Event) => {
</div> </div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">

2
packages/nc-gui/composables/useProject.ts

@ -1,7 +1,6 @@
import type { BaseType, OracleUi, ProjectType, TableType } from 'nocodb-sdk' import type { BaseType, OracleUi, ProjectType, TableType } from 'nocodb-sdk'
import { SqlUiFactory } from 'nocodb-sdk' import { SqlUiFactory } from 'nocodb-sdk'
import { isString } from '@vueuse/core' import { isString } from '@vueuse/core'
import { useRoute } from 'vue-router'
import { import {
ClientType, ClientType,
computed, computed,
@ -12,6 +11,7 @@ import {
useInjectionState, useInjectionState,
useNuxtApp, useNuxtApp,
useRoles, useRoles,
useRoute,
useRouter, useRouter,
useTheme, useTheme,
} from '#imports' } from '#imports'

Loading…
Cancel
Save