Merge branch 'develop' into setthawut

src/views/MainLayout.vue

@@ -97,7 +97,7 @@ async function getDataNotification(index: number, type: string) {
     minute: "2-digit",
   };
   await http
-    .get(config.API.msgNotificate + `?page=${index}&pageSize=${10}`)
+    .get(config.API.msgNotificate + `?page=${index}&pageSize=${15}`)
     .then((res) => {
       const response = res.data.result.data;
       totalInbox.value = res.data.result.total;
@@ -237,7 +237,8 @@ function doLogout() {
   dialogConfirm(
     $q,
     async () => {
-      logout();
+      await http.post(config.API.keycloakLogSSO, { text: "ออกจากระบบ" });
+      await logout();
     },
     "ยืนยันการออกจากระบบ",
     "ต้องการออกจากระบบใช่หรือไม่?"
@@ -286,9 +287,9 @@ function onLoad(index: any, done: Function) {
     (notiList.value.length === 0 && totalInbox.value === 0)
   ) {
     page.value++;
-    setTimeout(() => {
+    setTimeout(async () => {
+      await getDataNotification(page.value, "NOMAL");
       done();
-      getDataNotification(page.value, "NOMAL");
     }, 1500);
   }
 }
@@ -443,7 +444,11 @@ onUnmounted(() => {
             v-if="totalNoti !== 0"
             >{{ totalNoti }}</q-badge
           >
-          <q-menu v-model="notiTrigger" :offset="[0, 8]" style="width: 480px">
+          <q-menu
+            v-model="notiTrigger"
+            :offset="[0, 8]"
+            style="width: 480px; height: 60vh"
+          >
             <div class="q-px-md q-py-sm row col-12 items-center">
               <div class="text-subtitle1 text-weight-medium">การแจ้งเตือน</div>
               <q-space />