Merge branch 'develop' into NiceDev

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

@@ -23,6 +23,7 @@ import DialogDetail from "@/modules/05_leave/components/DialogDetail.vue"
 
 /** import stort*/
 import { useCounterMixin } from "@/stores/mixin"
+import { aR } from "@fullcalendar/core/internal-common"
 
 const mixin = useCounterMixin()
 const { showLoader, hideLoader, messageError, date2Thai, monthYear2Thai, dateToISO } = mixin
@@ -289,11 +290,16 @@ onMounted(async () => {
 						<div class="main-content">
 							<FullCalendar ref="fullCalendar" class="demo-app-calendar" :options="calendarOptions">
 								<template v-slot:eventContent="arg">
-									<div class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
+									<div v-if="arg.event.textColor == 'black'" class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
 										<div class="textHover col-10" @click="onCilckview(arg.event.id)">
 											{{ arg.event.title }}
 										</div>
 									</div>
+									<div v-else class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
+										<div class="textHover col-10">
+											{{ arg.event.title }}
+										</div>
+									</div>
 								</template>
 							</FullCalendar>
 						</div>

src/modules/06_evaluate/components/DialogMain.vue

@@ -86,8 +86,8 @@ watch(props, () => {
       <q-separator />
       <q-carousel
         v-model="slide"
-        transition-prev="scale"
-        transition-next="scale"
+        transition-prev="slide-right"
+        transition-next="slide-left"
         swipeable
         animated
         control-type="regular"