mirror of
https://github.com/nocodb/nocodb.git
synced 2026-04-30 02:26:31 +00:00
merge fix
This commit is contained in:
@@ -64,9 +64,11 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
|
||||
<JsBarcodeWrapper
|
||||
v-if="showBarcode && rowHeight"
|
||||
:barcode-value="barcodeValue"
|
||||
tabindex="0"
|
||||
:barcode-format="barcodeMeta.barcodeFormat"
|
||||
:custom-style="{ height: rowHeight ? `${rowHeight * 1.4}rem` : `1.4rem`, width: 40 }"
|
||||
@on-click-barcode="showBarcodeModal"
|
||||
@keydown.enter.stop="showBarcodeModal"
|
||||
>
|
||||
<template #barcodeRenderError>
|
||||
<div class="text-left text-wrap mt-2 text-[#e65100] text-xs" data-testid="barcode-invalid-input-message">
|
||||
@@ -76,9 +78,11 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
|
||||
</JsBarcodeWrapper>
|
||||
<JsBarcodeWrapper
|
||||
v-else-if="showBarcode"
|
||||
tabindex="0"
|
||||
:barcode-value="barcodeValue"
|
||||
:barcode-format="barcodeMeta.barcodeFormat"
|
||||
@on-click-barcode="showBarcodeModal"
|
||||
@keydown.enter.stop="showBarcodeModal"
|
||||
>
|
||||
<template #barcodeRenderError>
|
||||
<div class="text-left text-wrap mt-2 text-[#e65100] text-xs" data-testid="barcode-invalid-input-message">
|
||||
|
||||
Reference in New Issue
Block a user