diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index 3b2507f1e..96e45d3ef 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -186,7 +186,7 @@ onMounted(() => { if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300); }); -const someIsLoading = computed(() => isLoading.value || arrayData?.isLoading?.value); +const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value); function findKeyInOptions() { if (!$props.options) return; return filter($props.modelValue, $props.options)?.length; diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 2e880a16d..9828b35ae 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -1,4 +1,4 @@ -import { onMounted, computed } from 'vue'; +import { onMounted, computed, ref } from 'vue'; import { useRouter, useRoute } from 'vue-router'; import axios from 'axios'; import { useArrayDataStore } from 'stores/useArrayDataStore'; @@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) { } const totalRows = computed(() => (store.data && store.data.length) || 0); - const isLoading = computed(() => store.isLoading || false); + const isLoading = ref(store.isLoading || false); return { fetch,