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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle

This commit is contained in:
Alex Moreno 2025-01-29 12:08:40 +01:00
parent 0a88479a9e f3854d9682
commit 6ff774f1b0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/common/VnSection.vue
View File

@ -98,8 +98,8 @@ function checkIsMain() {
/> />
<div :id="searchbarId"></div> <div :id="searchbarId"></div>
</slot> </slot>
<RightAdvancedMenu :is-main-section="isMainSection && rightFilter"> <RightAdvancedMenu :is-main-section="isMainSection">
<template #advanced-menu v-if="$slots[advancedMenuSlot]"> <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
<slot :name="advancedMenuSlot"> <slot :name="advancedMenuSlot">
<VnTableFilter <VnTableFilter
v-if="rightFilter && columns" v-if="rightFilter && columns"

7
src/pages/Route/Card/RouteCard.vue
View File

@ -3,5 +3,10 @@ import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
import VnCardBeta from 'src/components/common/VnCardBeta.vue'; import VnCardBeta from 'src/components/common/VnCardBeta.vue';
</script> </script>
<template> <template>
<VnCardBeta data-key="Route" base-url="Routes/filter" :descriptor="RouteDescriptor" /> <VnCardBeta
data-key="Route"
base-url="Routes"
custom-url="Routes/filter"
:descriptor="RouteDescriptor"
/>
</template> </template>