diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue index 2c40e26ce..2dad8fe52 100644 --- a/src/components/VnTable/VnFilter.vue +++ b/src/components/VnTable/VnFilter.vue @@ -25,6 +25,10 @@ const $props = defineProps({ type: String, default: 'table', }, + customClass: { + type: String, + default: '', + }, }); defineExpose({ addFilter, props: $props }); @@ -55,7 +59,7 @@ const selectComponent = { component: markRaw(VnSelect), event: updateEvent, attrs: { - class: 'q-pt-none fit vn-label-padding', + class: `q-pt-none fit ${$props.customClass}`, dense: true, filled: !$props.showTitle, }, @@ -159,8 +163,8 @@ const onTabPressed = async () => { /> - diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index f81deba19..630b50d20 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -384,7 +384,7 @@ async function renderInput(rowId, field, clickedElement) { editingRow.value = rowId; const originalColumn = $props.columns.find((col) => col.name === field); - const column = { ...originalColumn }; + const column = { ...originalColumn, ...{ label: '' } }; const row = CrudModelRef.value.formData[rowId]; const oldValue = CrudModelRef.value.formData[rowId][column?.name]; @@ -626,6 +626,7 @@ const checkbox = ref(null); v-if="col.visible ?? true" class="body-cell" :style="col?.width ? `max-width: ${col?.width}` : ''" + style="padding: inherit" >
@@ -1174,4 +1175,8 @@ es: height: 100%; display: flex; } + +label.header-filter > .q-field__inner > .q-field__control { + padding: inherit; +} diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue index a0576ee2a..76e1bb860 100644 --- a/src/pages/Entry/Card/EntryBuys.vue +++ b/src/pages/Entry/Card/EntryBuys.vue @@ -218,11 +218,11 @@ const columns = [ { align: 'center', labelAbbreviation: 'GM', + label: t('Grouping selector'), toolTip: t('Grouping selector'), name: 'groupingMode', component: 'toggle', attrs: { - label: '', 'toggle-indeterminate': true, trueValue: 'grouping', falseValue: 'packing', @@ -595,6 +595,7 @@ onMounted(() => { ref="entryBuysRef" data-key="EntryBuys" :url="`Entries/${entityId}/getBuyList`" + order="name DESC" save-url="Buys/crud" :disable-option="{ card: true }" v-model:selected="selectedRows"