diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue index 6a2ef09fff..f0dceb10b2 100644 --- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue +++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue @@ -203,6 +203,7 @@ const newRecord = () => {
{ :style="{ ...record.rowMeta.style, zIndex: record.rowMeta.id === draggingId ? 100 : 0, + lineHeight: '18px', + opacity: (draggingId === null || record.rowMeta.id === draggingId) && (resizeRecord === null || record.rowMeta.id === resizeRecord?.rowMeta.id) diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue index 5bfdbe6250..d4e47e148b 100644 --- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue +++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue @@ -106,4 +106,11 @@ const emit = defineEmits(['resize-start']) .resize { cursor: ew-resize; } + +.plain-cell { + line-height: 18px; + .bold { + @apply !text-gray-800 font-bold; + } +} diff --git a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue index 9efa362a2f..4aef3bbbd5 100644 --- a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue +++ b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue @@ -88,8 +88,9 @@ const emit = defineEmits(['resize-start']) } .plain-cell { + line-height: 18px; .bold { - @apply !text-gray-800 font-semibold; + @apply !text-gray-800 font-bold; } } diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue index 548010282d..782f35418c 100644 --- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue +++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue @@ -548,6 +548,7 @@ const addRecord = (date: dayjs.Dayjs) => { :data-unique-id="record.rowMeta.id" :style="{ ...record.rowMeta.style, + lineHeight: '18px', }" class="absolute group draggable-record pointer-events-auto nc-calendar-week-record-card" @mouseleave="hoverRecord = null" diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue index 702b908919..81ba47e06f 100644 --- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue +++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue @@ -550,12 +550,12 @@ const recordsAcrossAllRange = computed<{ left = width * (overlapIndex - 1) - width = Math.max((width / 100) * containerWidth.value - 8, 72) + width = Math.max((width / 100) * containerWidth.value, 72) - 8 - left = majorLeft + (left / 100) * containerWidth.value + 4 + left = majorLeft + (left / 100) * containerWidth.value + 4.5 if (majorLeft + perWidth < left + width) { - left = majorLeft + (perWidth - width - 4) + left = majorLeft + (perWidth - width) + 4 } } } else { @@ -1063,6 +1063,7 @@ watch( :data-unique-id="record.rowMeta!.id" :style="{ ...record.rowMeta.style, + lineHeight: '18px', opacity: (dragRecord === null || record.rowMeta.id === dragRecord?.rowMeta.id) && (resizeRecord === null || record.rowMeta.id === resizeRecord?.rowMeta.id)