Merge branch 'NiceDev' into develop

src/modules/05_leave/components/Calendar.vue

@@ -242,7 +242,7 @@ const filterVal = ref<any>([keycloakId.value]);
 /**** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่Calendar */
 watch(
   () => filterVal.value,
-  () => {
+  async () => {
     const eventData = filterVal.value.map((item: any) => {
       return mainData.value
         .filter(
@@ -265,7 +265,7 @@ watch(
     });
     const allEventData = [].concat(...eventData);
     calendarOptions.value.events = allEventData;
-    fetchData();
+    await fetchData();
   }
 );