Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Benjamin Esteve 2025-04-23 07:04:39 +00:00
commit 17211b5e4e
2 changed files with 14 additions and 3 deletions

View File

@ -1,6 +1,6 @@
<script setup>
import { markRaw, computed } from 'vue';
import { QCheckbox, QToggle } from 'quasar';
import { markRaw, computed, onBeforeMount } from 'vue';
import { QToggle } from 'quasar';
import { useArrayData } from 'composables/useArrayData';
import VnSelect from 'components/common/VnSelect.vue';
import VnInput from 'components/common/VnInput.vue';
@ -150,6 +150,16 @@ const showFilter = computed(
const onTabPressed = async () => {
if (model.value) enterEvent['keyup.enter']();
};
onBeforeMount(() => {
const columnFilter = $props.column?.columnFilter;
const component = columnFilter?.component;
const defaultComponent = components[component];
const events = { update: updateEvent, enter: enterEvent };
if (!columnFilter || defaultComponent) return;
$props.column.columnFilter.event = events[columnFilter.event];
});
</script>
<template>
<div v-if="showFilter" class="full-width" style="overflow: hidden">

View File

@ -133,6 +133,7 @@ const columns = computed(() => [
label: null,
name: 'supplierFk',
class: 'fit',
event: 'update',
},
},
{
@ -472,6 +473,6 @@ en:
es:
IntraCommunity: Intracomunitaria
NonCommunity: Extracomunitaria
CanaryIsland: Islas Canarias
CanaryIslands: Islas Canarias
National: Nacional
</i18n>