Browse Source

fix: minor bugs fixes

pull/9831/head
DarkPhoenix2704 1 week ago
parent
commit
e71418722a
  1. 1
      packages/nc-gui/components/smartsheet/PlainCell.vue
  2. 1
      packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
  3. 7
      packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
  4. 2
      packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
  5. 10
      packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
  6. 7
      packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue

1
packages/nc-gui/components/smartsheet/PlainCell.vue

@ -372,6 +372,7 @@ const parseValue = (value: any, col: ColumnType): string => {
<style lang="scss" scoped> <style lang="scss" scoped>
.plain-cell { .plain-cell {
font-synthesis: initial !important;
&::before { &::before {
content: '•'; content: '•';
padding: 0 4px; padding: 0 4px;

1
packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue

@ -211,6 +211,7 @@ const newRecord = () => {
<LazySmartsheetCalendarRecordCard <LazySmartsheetCalendarRecordCard
:record="record" :record="record"
:resize="false" :resize="false"
:position="record.rowMeta.position"
size="small" size="small"
@click.prevent="emit('expandRecord', record)" @click.prevent="emit('expandRecord', record)"
> >

7
packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue

@ -1046,7 +1046,10 @@ const expandRecord = (record: Row) => {
</div> </div>
</div> </div>
<div class="absolute inset-0 pointer-events-none"> <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"> <template v-for="record in recordsAcrossAllRange.record" :key="record.rowMeta.id">
<div <div
v-if="record.rowMeta.style?.display !== 'none'" v-if="record.rowMeta.style?.display !== 'none'"
@ -1115,7 +1118,7 @@ const expandRecord = (record: Row) => {
&:after { &:after {
@apply rounded-sm pointer-events-none absolute inset-0 w-full h-full; @apply rounded-sm pointer-events-none absolute inset-0 w-full h-full;
content: ''; content: '';
z-index: 3; z-index: 1;
box-shadow: 0 0 0 2px #3366ff !important; box-shadow: 0 0 0 2px #3366ff !important;
} }
} }

2
packages/nc-gui/components/smartsheet/calendar/RecordCard.vue

@ -90,7 +90,7 @@ const emit = defineEmits(['resize-start'])
<div <div
v-if="(position === 'rightRounded' || position === 'rounded') && resize" 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)" @mousedown.stop="emit('resize-start', 'right', $event, record)"
></div> ></div>
</div> </div>

10
packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue

@ -155,9 +155,9 @@ const calendarData = computed(() => {
position, position,
id, id,
style: { style: {
width: `calc(max(${spanDays} * ${perDayWidth}px, ${perDayWidth}px))`, width: `calc(max(${spanDays * perDayWidth - 10}px, ${perDayWidth - 10}px))`,
left: `${startDaysDiff * perDayWidth}px`, left: `${startDaysDiff * perDayWidth + 4}px`,
top: `${suitableRow * 28 + suitableRow * 8}px`, top: `${suitableRow * 28 + Math.max(suitableRow + 1, 1) * 8}px`,
}, },
}, },
}) })
@ -538,7 +538,7 @@ const addRecord = (date: dayjs.Dayjs) => {
></div> ></div>
</div> </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" data-testid="nc-calendar-week-record-container"
> >
<template v-for="(record, id) in calendarData" :key="id"> <template v-for="(record, id) in calendarData" :key="id">
@ -595,7 +595,7 @@ const addRecord = (date: dayjs.Dayjs) => {
&:after { &:after {
@apply rounded-b-sm pointer-events-none absolute inset-0 w-full h-full; @apply rounded-b-sm pointer-events-none absolute inset-0 w-full h-full;
content: ''; content: '';
z-index: 3; z-index: 1;
box-shadow: 2px 0 0 #3366ff, -2px 0 0 #3366ff, 0 2px 0 #3366ff !important; box-shadow: 2px 0 0 #3366ff, -2px 0 0 #3366ff, 0 2px 0 #3366ff !important;
} }
} }

7
packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue

@ -1053,7 +1053,10 @@ watch(
</div> </div>
</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"> <template v-for="record in recordsAcrossAllRange.records" :key="record.rowMeta.id">
<div <div
v-if="record.rowMeta.style?.display !== 'none'" v-if="record.rowMeta.style?.display !== 'none'"
@ -1124,7 +1127,7 @@ watch(
&:after { &:after {
@apply rounded-sm pointer-events-none absolute inset-0 w-full h-full; @apply rounded-sm pointer-events-none absolute inset-0 w-full h-full;
content: ''; content: '';
z-index: 2; z-index: 1;
box-shadow: 0 0 0 2px #3366ff !important; box-shadow: 0 0 0 2px #3366ff !important;
} }
} }

Loading…
Cancel
Save