diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue index 1881e9753..8ad25b80f 100644 --- a/src/pages/Zone/Card/ZoneCard.vue +++ b/src/pages/Zone/Card/ZoneCard.vue @@ -23,7 +23,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) { :base-url="notIsLocations('Zones', undefined)" :descriptor="ZoneDescriptor" :filter-panel="notIsLocations(ZoneFilterPanel, undefined)" - :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')" + :search-data-key="notIsLocations('ZoneList', undefined)" :custom-url="`Zones/${route.params?.id}/getLeaves`" :searchbar-props="{ url: notIsLocations('Zones', 'ZoneLocations'), diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue index 6b3934df7..89231f75e 100644 --- a/src/pages/Zone/Card/ZoneLocationsTree.vue +++ b/src/pages/Zone/Card/ZoneLocationsTree.vue @@ -5,6 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue'; import { useState } from 'src/composables/useState'; import axios from 'axios'; import { useArrayData } from 'composables/useArrayData'; +import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; const props = defineProps({ rootLabel: { @@ -33,8 +34,10 @@ const state = useState(); const treeRef = ref(); const expanded = ref([]); -const arrayData = useArrayData('ZoneLocations', { - url: `Zones/${route.params.id}/getLeaves`, +const datakey = 'ZoneLocations'; +const url = computed(() => `Zones/${route.params.id}/getLeaves`); +const arrayData = useArrayData(datakey, { + url: url.value, }); const { store } = arrayData; const storeData = computed(() => store.data); @@ -193,6 +196,7 @@ onUnmounted(() => { +