Merge branch 'master' into Hotfix-RouteSendSms

src/components/common/VnSelect.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
@@ -247,6 +247,7 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
+    if (isLoading.value) return update();
     if (!val && lastVal.value === val) {
         lastVal.value = val;
         return update();
@@ -294,6 +295,7 @@ async function onScroll({ to, direction, from, index }) {
         await arrayData.loadMore();
         setOptions(arrayData.store.data);
         vnSelectRef.value.scrollTo(lastIndex);
+        await nextTick();
         isLoading.value = false;
     }
 }

src/pages/Zone/Card/ZoneCard.vue

@@ -19,7 +19,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 <template>
     <VnCard
         data-key="Zone"
-        :url="notIsLocations('Zones', undefined)"
+        :url="notIsLocations(`Zones/${route.params.id}`, undefined)"
         :descriptor="ZoneDescriptor"
         :filter="filter"
         :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"