Browse Source

fix parameters menu and UiDatePicker

Olivier Massot 8 months ago
parent
commit
a8c489eba6
2 changed files with 10 additions and 2 deletions
  1. 8 2
      components/Layout/Parameters/Menu.vue
  2. 2 0
      components/Ui/Input/DatePicker.vue

+ 8 - 2
components/Layout/Parameters/Menu.vue

@@ -23,7 +23,7 @@
         :title="$t(item.label)"
         :prepend-icon="item.icon ? item.icon.name : ''"
         :to="(item as MenuItem).to"
-        @click="closeMenu"
+        @click="onItemClicked"
       >
       </v-list-item>
     </v-list>
@@ -50,7 +50,7 @@ import type { MenuGroup, MenuItem } from '~/types/layout'
 
 const { mdAndUp, lgAndUp } = useDisplay()
 
-const { getMenu, hasMenu, isMenuOpened, setMenuState } = useMenu()
+const { getMenu, hasMenu, isMenuOpened, setMenuState, closeMenu } = useMenu()
 
 const menu: MenuGroup | null = getMenu('Parameters')
 
@@ -71,6 +71,12 @@ const isRail = computed(() => {
   )
 })
 
+const onItemClicked = () => {
+  if (!lgAndUp.value) {
+    closeMenu('Parameters')
+  }
+}
+
 const unwatch = watch(mdAndUp, () => {
   // Par défaut si l'écran est trop petit au chargement de la page, le menu doit rester fermé.
   if (process.client && menu !== null) {

+ 2 - 0
components/Ui/Input/DatePicker.vue

@@ -98,7 +98,9 @@ const date: Ref<Date | undefined> = ref(
 )
 
 const onUpdate = (event: string) => {
+  console.log(event)
   updateViolationState(event)
+  date.value = event ? new Date(event) : undefined
   emit('update:model-value', date.value ? formatISO(date.value) : undefined)
 }
 </script>