Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
17211b5e4e
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { markRaw, computed } from 'vue';
|
import { markRaw, computed, onBeforeMount } from 'vue';
|
||||||
import { QCheckbox, QToggle } from 'quasar';
|
import { QToggle } from 'quasar';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import VnSelect from 'components/common/VnSelect.vue';
|
import VnSelect from 'components/common/VnSelect.vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
|
@ -150,6 +150,16 @@ const showFilter = computed(
|
||||||
const onTabPressed = async () => {
|
const onTabPressed = async () => {
|
||||||
if (model.value) enterEvent['keyup.enter']();
|
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>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
||||||
|
|
|
@ -133,6 +133,7 @@ const columns = computed(() => [
|
||||||
label: null,
|
label: null,
|
||||||
name: 'supplierFk',
|
name: 'supplierFk',
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
|
event: 'update',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -472,6 +473,6 @@ en:
|
||||||
es:
|
es:
|
||||||
IntraCommunity: Intracomunitaria
|
IntraCommunity: Intracomunitaria
|
||||||
NonCommunity: Extracomunitaria
|
NonCommunity: Extracomunitaria
|
||||||
CanaryIsland: Islas Canarias
|
CanaryIslands: Islas Canarias
|
||||||
National: Nacional
|
National: Nacional
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
Loading…
Reference in New Issue