verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 78 Releases Wiki Activity

Merge pull request 'HOTFIX VnSelect scroll' (!1763) from hotfix_vnselect_scroll into master
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1763
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
This commit is contained in:
Javier Segarra 2025-04-29 14:42:07 +00:00
parent 7de36bb8c7 07db153302
commit e2e84d3a69
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/common/VnSelect.vue
View File

@ -161,7 +161,7 @@ const arrayData = useArrayData(arrayDataKey, {
searchUrl: false,
mapKey: $attrs['map-key'],
});
const isMenuOpened = ref(false);
const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC';
});
@ -184,7 +184,9 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
});
const someIsLoading = computed(() => isLoading.value || arrayData.isLoading);
const someIsLoading = computed(
() => (isLoading.value || !!arrayData?.isLoading?.value) && !isMenuOpened.value,
);
function findKeyInOptions() {
if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length;
@ -368,8 +370,9 @@ function getCaption(opt) {
hide-bottom-space
:input-debounce="useURL ? '300' : '0'"
:loading="someIsLoading"
:disable="someIsLoading"
@virtual-scroll="onScroll"
@popup-hide="isMenuOpened = false"
@popup-show="isMenuOpened = true"
@keydown="handleKeyDown"
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
:data-url="url"