clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-04-30 04:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/minor-bug-fixes

Browse Source
This commit is contained in:
Ramesh Mane
2023-12-23 11:13:52 +05:30
committed by GitHub
parent 01b3df1702 8910befc57
commit 365499c11c
129 changed files with 6672 additions and 2300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
View File

@@ -64,6 +64,7 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
<JsBarcodeWrapper
v-if="showBarcode && rowHeight"
:barcode-value="barcodeValue"
tabindex="-1"
:barcode-format="barcodeMeta.barcodeFormat"
:custom-style="{ height: rowHeight ? `${rowHeight * 1.8}rem` : `1.8rem` }"
@on-click-barcode="showBarcodeModal"
@@ -76,6 +77,7 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
</JsBarcodeWrapper>
<JsBarcodeWrapper
v-else-if="showBarcode"
tabindex="-1"
:barcode-value="barcodeValue"
:barcode-format="barcodeMeta.barcodeFormat"
@on-click-barcode="showBarcodeModal"