Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

src/components/FormPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-defineProps({
+const $props = defineProps({
     title: {
         type: String,
         default: '',
@@ -25,16 +25,21 @@ defineProps({
         type: String,
         default: '',
     },
+    submitOnEnter: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
-
 const closeButton = ref(null);
 const isLoading = ref(false);
 
 const onSubmit = () => {
+    if ($props.submitOnEnter) {
         emit('onSubmit');
         closeForm();
+    }
 };
 
 const closeForm = () => {

src/components/ui/VnPaginate.vue

@@ -132,10 +132,24 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    arrayData.reset(['filter.skip', 'skip']);
+    arrayData.reset(['filter.skip', 'skip', 'page']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) isLoading.value = false;
+    return emitStoreData();
+}
 
+async function update(params) {
+    useArrayData(props.dataKey, params);
+    const { limit, skip } = store;
+    store.limit = limit + skip;
+    store.skip = 0;
+    await arrayData.fetch({ append: false });
+    store.limit = limit;
+    store.skip = skip;
+    return emitStoreData();
+}
+
+function emitStoreData() {
+    if (!store.hasMoreData) isLoading.value = false;
     emit('onFetch', store.data);
     return store.data;
 }
@@ -181,7 +195,7 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, addFilter, paginate });
+defineExpose({ fetch, update, addFilter, paginate });
 </script>
 
 <template>

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -352,7 +352,7 @@ const openTab = (id) =>
                 class="q-mr-sm"
                 dense
                 flat
-                @click="$refs.tableRef.reload()"
+                @click="tableRef.CrudModelRef.vnPaginateRef.update()"
             >
                 <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
             </QBtn>

src/pages/Zone/Card/ZoneEventExclusionForm.vue

@@ -43,7 +43,7 @@ const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 
 const isNew = computed(() => props.isNewMode);
-const dated = ref(null);
+const dated = ref(props.date);
 const tickedNodes = ref();
 
 const _excludeType = ref('all');
@@ -73,7 +73,6 @@ const exclusionCreate = async () => {
         await axios.post(`Zones/${route.params.id}/exclusions`, {
             dated: dated.value,
         });
-
     await refetchEvents();
 };
 
@@ -115,13 +114,14 @@ onMounted(() => {
         @on-submit="onSubmit()"
         :default-cancel-button="false"
         :default-submit-button="false"
+        :submit-on-enter="false"
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-lg">
                 <VnInputDate
                     :label="t('eventsInclusionForm.day')"
                     v-model="dated"
-                    :model-value="props.date"
+                    :required="true"
                 />
             </VnRow>
             <div class="column q-gutter-y-sm q-mb-md">
@@ -182,6 +182,7 @@ onMounted(() => {
                 :label="isNew ? t('globals.add') : t('globals.save')"
                 type="submit"
                 color="primary"
+                @click="onSubmit()"
             />
         </template>
     </FormPopup>

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -38,6 +38,7 @@ const datakey = 'ZoneLocations';
 const url = computed(() => `Zones/${route.params.id}/getLeaves`);
 const arrayData = useArrayData(datakey, {
     url: url.value,
+    limit: null,
 });
 const store = arrayData.store;
 
@@ -74,6 +75,7 @@ const onNodeExpanded = async (nodeKeysArray) => {
         if (response.data) {
             node.childs = response.data.map((n) => {
                 if (n.sons > 0) n.childs = [{}];
+                n.selected = isSelected(n.selected);
                 return n;
             });
         }
@@ -90,21 +92,16 @@ const onNodeExpanded = async (nodeKeysArray) => {
     previousExpandedNodes.value = nodeKeysSet;
 };
 
-const formatNodeSelected = (node) => {
-    if (node.selected === 1) node.selected = true;
-    else if (node.selected === 0) node.selected = false;
-
-    if (node.sons > 0 && !node.childs) node.childs = [{}];
-};
-
 const fetchNodeLeaves = async (nodeKey) => {
     if (!treeRef.value) return;
     const node = treeRef.value?.getNodeByKey(nodeKey);
-    if (node.selected === 1) node.selected = true;
-    else if (node.selected === 0) node.selected = false;
+    if (typeof node.selected === 'number') node.selected = !!node.selected;
+    if (node.sons > 0 && !node.childs) {
+        node.childs = [{}];
+        const index = expanded.value.indexOf(node.id);
+        expanded.value.splice(index, 1);
+    }
     if (!node || node.sons === 0) return;
-
-    state.set('Tree', node);
 };
 
 function getNodeIds(node) {
@@ -119,6 +116,10 @@ function getNodeIds(node) {
     return ids;
 }
 
+function isSelected(selected) {
+    if (typeof selected === 'number') return !!selected;
+}
+
 watch(
     () => store.data,
     async (val) => {
@@ -128,32 +129,21 @@ watch(
         nodes.value[0].childs = [...val];
         const fetchedNodeKeys = val.flatMap(getNodeIds);
         state.set('Tree', [...fetchedNodeKeys]);
-
-        if (!store.userParams?.search) {
-            val.forEach((n) => {
-                formatNodeSelected(n);
-            });
-            store.data = null;
-            expanded.value = [null];
-        } else {
+        expanded.value = [null, ...fetchedNodeKeys];
         for (let n of state.get('Tree')) {
             await fetchNodeLeaves(n);
         }
-            expanded.value = [null, ...fetchedNodeKeys];
-        }
         previousExpandedNodes.value = new Set(expanded.value);
     },
     { immediate: true }
 );
 
 const reFetch = async () => {
-    const { data } = await arrayData.fetch({ append: false });
-    nodes.value = data;
-    expanded.value = [null];
+    await arrayData.fetch({});
 };
 
 onMounted(async () => {
-    if (store.userParams?.search) await arrayData.fetch({});
+    await reFetch();
 });
 
 onUnmounted(() => {
@@ -167,13 +157,13 @@ onUnmounted(() => {
         v-if="showSearchBar"
         v-model="store.userParams.search"
         :placeholder="$t('globals.search')"
-        @update:model-value="reFetch()"
+        @keydown.enter.stop.prevent="reFetch"
     >
         <template #prepend>
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
+    <VnSearchbar v-if="!showSearchBar" :data-key="datakey" :url="url" :redirect="false" />
     <QTree
         ref="treeRef"
         :nodes="nodes"