From e71418722aa80a750e4fb31ce2d0be4b1e0db336 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 20 Nov 2024 17:43:15 +0000
Subject: [PATCH] fix: minor bugs fixes

---
 packages/nc-gui/components/smartsheet/PlainCell.vue    |  1 +
 .../smartsheet/calendar/DayView/DateField.vue          |  1 +
 .../smartsheet/calendar/DayView/DateTimeField.vue      |  7 +++++--
 .../components/smartsheet/calendar/RecordCard.vue      |  2 +-
 .../smartsheet/calendar/WeekView/DateField.vue         | 10 +++++-----
 .../smartsheet/calendar/WeekView/DateTimeField.vue     |  7 +++++--
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/PlainCell.vue b/packages/nc-gui/components/smartsheet/PlainCell.vue
index a8ff3407fd..6a190cfada 100644
--- a/packages/nc-gui/components/smartsheet/PlainCell.vue
+++ b/packages/nc-gui/components/smartsheet/PlainCell.vue
@@ -372,6 +372,7 @@ const parseValue = (value: any, col: ColumnType): string => {
 
 <style lang="scss" scoped>
 .plain-cell {
+  font-synthesis: initial !important;
   &::before {
     content: '•';
     padding: 0 4px;
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index bd971f8c79..6a2ef09fff 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -211,6 +211,7 @@ const newRecord = () => {
             <LazySmartsheetCalendarRecordCard
               :record="record"
               :resize="false"
+              :position="record.rowMeta.position"
               size="small"
               @click.prevent="emit('expandRecord', record)"
             >
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 91a66e9d7d..174f2f2c2d 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -1046,7 +1046,10 @@ const expandRecord = (record: Row) => {
         </div>
       </div>
       <div class="absolute inset-0 pointer-events-none">
-        <div class="relative !ml-[68px] !mr-1 nc-calendar-day-record-container" data-testid="nc-calendar-day-record-container">
+        <div
+          class="relative !ml-[68px] !mr-1 z-2 nc-calendar-day-record-container"
+          data-testid="nc-calendar-day-record-container"
+        >
           <template v-for="record in recordsAcrossAllRange.record" :key="record.rowMeta.id">
             <div
               v-if="record.rowMeta.style?.display !== 'none'"
@@ -1115,7 +1118,7 @@ const expandRecord = (record: Row) => {
   &:after {
     @apply rounded-sm pointer-events-none absolute inset-0 w-full h-full;
     content: '';
-    z-index: 3;
+    z-index: 1;
     box-shadow: 0 0 0 2px #3366ff !important;
   }
 }
diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index e40b6eec75..8019a9d3bd 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -90,7 +90,7 @@ const emit = defineEmits(['resize-start'])
 
     <div
       v-if="(position === 'rightRounded' || position === 'rounded') && resize"
-      class="absolute mt-0.3 h-7.1 w-2 right-1 resize"
+      class="absolute mt-0.3 h-7.1 w-2 right-0 resize"
       @mousedown.stop="emit('resize-start', 'right', $event, record)"
     ></div>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 9d77d8b92a..548010282d 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -155,9 +155,9 @@ const calendarData = computed(() => {
           position,
           id,
           style: {
-            width: `calc(max(${spanDays} * ${perDayWidth}px, ${perDayWidth}px))`,
-            left: `${startDaysDiff * perDayWidth}px`,
-            top: `${suitableRow * 28 + suitableRow * 8}px`,
+            width: `calc(max(${spanDays * perDayWidth - 10}px, ${perDayWidth - 10}px))`,
+            left: `${startDaysDiff * perDayWidth + 4}px`,
+            top: `${suitableRow * 28 + Math.max(suitableRow + 1, 1) * 8}px`,
           },
         },
       })
@@ -538,7 +538,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       ></div>
     </div>
     <div
-      class="absolute nc-scrollbar-md overflow-y-auto mt-6 pointer-events-none inset-0"
+      class="absolute nc-scrollbar-md overflow-y-auto z-2 mt-6 pointer-events-none inset-0"
       data-testid="nc-calendar-week-record-container"
     >
       <template v-for="(record, id) in calendarData" :key="id">
@@ -595,7 +595,7 @@ const addRecord = (date: dayjs.Dayjs) => {
   &:after {
     @apply rounded-b-sm pointer-events-none absolute inset-0 w-full h-full;
     content: '';
-    z-index: 3;
+    z-index: 1;
     box-shadow: 2px 0 0 #3366ff, -2px 0 0 #3366ff, 0 2px 0 #3366ff !important;
   }
 }
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 1574a55cb8..0363c8d5e7 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -1053,7 +1053,10 @@ watch(
         </div>
       </div>
 
-      <div class="absolute pointer-events-none inset-0 overflow-hidden !mt-5.95" data-testid="nc-calendar-week-record-container">
+      <div
+        class="absolute pointer-events-none z-2 inset-0 overflow-hidden !mt-5.95"
+        data-testid="nc-calendar-week-record-container"
+      >
         <template v-for="record in recordsAcrossAllRange.records" :key="record.rowMeta.id">
           <div
             v-if="record.rowMeta.style?.display !== 'none'"
@@ -1124,7 +1127,7 @@ watch(
   &:after {
     @apply rounded-sm pointer-events-none absolute inset-0 w-full h-full;
     content: '';
-    z-index: 2;
+    z-index: 1;
     box-shadow: 0 0 0 2px #3366ff !important;
   }
 }