From 8ccb128cbaff5c34bccf191c27e658023f9370a8 Mon Sep 17 00:00:00 2001 From: mertmit Date: Tue, 24 Jan 2023 20:59:19 +0300 Subject: [PATCH] fix: set default row height to short Signed-off-by: mertmit --- packages/nc-gui/components/cell/TextArea.vue | 2 ++ packages/nc-gui/components/smartsheet/Cell.vue | 4 +++- packages/nc-gui/components/smartsheet/Grid.vue | 2 ++ packages/nc-gui/components/virtual-cell/QrCode.vue | 2 ++ packages/nc-gui/components/virtual-cell/barcode/Barcode.vue | 3 ++- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue index 5dd2ee702d..ad2fd14546 100644 --- a/packages/nc-gui/components/cell/TextArea.vue +++ b/packages/nc-gui/components/cell/TextArea.vue @@ -28,6 +28,8 @@ const rowHeight = computed(() => { return 4 case 3: return 6 + default: + return 1 } } }) diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue index f10ebd9a76..b9ff55cfaa 100644 --- a/packages/nc-gui/components/smartsheet/Cell.vue +++ b/packages/nc-gui/components/smartsheet/Cell.vue @@ -139,6 +139,8 @@ const rowHeight = computed(() => { return 4 case 3: return 6 + default: + return 1 } } }) @@ -150,7 +152,7 @@ const rowHeight = computed(() => { :class="[ `nc-cell-${(column?.uidt || 'default').toLowerCase()}`, { 'text-blue-600': isPrimary(column) && !props.virtual && !isForm }, - { '!h-auto': !rowHeight || rowHeight === 1 }, + { 'm-y-auto !h-auto': !rowHeight || rowHeight === 1 }, { '!h-full': rowHeight && rowHeight !== 1 }, ]" @keydown.enter.exact="syncAndNavigate(NavigateDir.NEXT, $event)" diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue index 95311a4177..e3849ad5cb 100644 --- a/packages/nc-gui/components/smartsheet/Grid.vue +++ b/packages/nc-gui/components/smartsheet/Grid.vue @@ -672,6 +672,8 @@ const rowHeight = computed(() => { return 4 case 3: return 6 + default: + return 1 } } }) diff --git a/packages/nc-gui/components/virtual-cell/QrCode.vue b/packages/nc-gui/components/virtual-cell/QrCode.vue index c255143618..14b772bc74 100644 --- a/packages/nc-gui/components/virtual-cell/QrCode.vue +++ b/packages/nc-gui/components/virtual-cell/QrCode.vue @@ -26,6 +26,8 @@ const rowHeight = computed(() => { return 4 case 3: return 6 + default: + return 1 } } }) diff --git a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue index ecf5b39f16..0736c937da 100644 --- a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue +++ b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue @@ -35,7 +35,6 @@ const showBarcode = computed(() => barcodeValue?.value.length > 0 && !tooManyCha const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning } = useShowNotEditableWarning() - const rowHeight = computed(() => { if ((view.value?.view as GridType)?.row_height !== undefined) { switch ((view.value?.view as GridType)?.row_height) { @@ -47,6 +46,8 @@ const rowHeight = computed(() => { return 4 case 3: return 6 + default: + return 1 } } })