Forráskód Böngészése

Merge tag 'fix' into develop

Vincent GUFFON 3 éve
szülő
commit
dc25ccc2da

+ 8 - 3
components/Layout/SubHeader/PersonnalizedList.vue

@@ -37,7 +37,7 @@
                 exact
               >
                 <v-list-item-title>
-                  {{item.label}} - <strong>{{$t(item.menuKey)}}</strong>
+                  {{item.label}} - <strong>{{item.menuKey}}</strong>
                 </v-list-item-title>
               </v-list-item>
             </template>
@@ -76,14 +76,19 @@ export default defineComponent({
 
     const items:ComputedRef<Array<AnyJson>> = computed(() => {
       const query = repositoryHelper.getRepository(PersonalizedList).query()
-      return queryHelper.getCollection(query, {'label':'asc'}) as Collection<PersonalizedList>
+      const lists = queryHelper.getCollection(query, {'label':'asc'}) as Collection<PersonalizedList>
+      lists.map(item => {
+        const menu: string = i18n.t(item.menuKey) as string
+        item.menuKey = menu
+      })
+      return lists
     })
 
     const search = ref('');
     const filteredItems = computed(() => {
       return items.value.filter( item => {
           return item.label.toLowerCase().indexOf(search.value.toLowerCase()) >= 0
-            ||i18n.t(item.menuKey).toLowerCase().indexOf(search.value.toLowerCase()) >= 0
+            ||item.menuKey.toLowerCase().indexOf(search.value.toLowerCase()) >= 0
         }
       )
     })

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

@@ -95,13 +95,13 @@ export default defineComponent({
     }
 
     const datesFormatted: ComputedRef<string|null> = computed(() => {
-      if (props.range && datesParsed.value.length < 2) { return }
+      if (props.range && datesParsed.value && datesParsed.value.length < 2) { return null }
       return datesParsed.value ? dateUtils.formattedDate(datesParsed.value, 'DD/MM/YYYY') :  null
     })
 
     const unwatch: WatchStopHandle = watch(datesParsed, (newValue, oldValue) => {
       if (newValue === oldValue) { return }
-      if (props.range && newValue.length < 2) { return }
+      if (props.range && newValue && newValue.length < 2) { return }
       onChange(Array.isArray(newValue) ? dateUtils.sortDate(newValue) : newValue)
     })