Browse Source

fix(nc-gui): when multiple filters added, cases of record with no endDate

pull/7611/head
DarkPhoenix2704 7 months ago
parent
commit
9bed11d482
  1. 2
      packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
  2. 1
      packages/nc-gui/components/smartsheet/calendar/WeekView.vue

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

@ -52,7 +52,7 @@ withDefaults(defineProps<Props>(), {
class="block h-full min-h-5 ml-1 w-1 rounded mr-2"
></div>
</div>
<div class="ml-3 mt-2 absolute">
<div class="ml-3 mt-2 text-ellipsis overflow-hidden h-6 absolute">
<span v-if="position === 'rightRounded' || position === 'none'"> .... </span>
<span class="text-sm font-bold text-gray-800">{{ name }}</span>
<span v-if="showDate" class="text-xs ml-1 text-gray-600">{{ date }}</span>

1
packages/nc-gui/components/smartsheet/calendar/WeekView.vue

@ -70,6 +70,7 @@ const calendarData = computed(() => {
for (const record of [...formattedData.value].filter((r) => {
const startDate = dayjs(r.row[fromCol.title])
const endDate = dayjs(r.row[toCol.title])
if (!startDate.isValid() || !endDate.isValid()) return false
return !endDate.isBefore(startDate)
})) {
let startDate = dayjs(record.row[fromCol.title])

Loading…
Cancel
Save