Browse Source

feat: enable calendar end date

pull/9831/head
DarkPhoenix2704 2 days ago
parent
commit
3ccad671cc
  1. 18
      packages/nc-gui/components/dlg/ViewCreate.vue
  2. 8
      packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue

18
packages/nc-gui/components/dlg/ViewCreate.vue

@ -1017,7 +1017,7 @@ const getPluralName = (name: string) => {
</div> </div>
</a-select-option> </a-select-option>
</NcSelect> </NcSelect>
<!-- <div <div
v-if="range.fk_to_column_id === null && isEeUI" v-if="range.fk_to_column_id === null && isEeUI"
class="cursor-pointer flex items-center text-gray-800 gap-1" class="cursor-pointer flex items-center text-gray-800 gap-1"
@click="range.fk_to_column_id = undefined" @click="range.fk_to_column_id = undefined"
@ -1035,7 +1035,7 @@ const getPluralName = (name: string) => {
v-model:value="range.fk_to_column_id" v-model:value="range.fk_to_column_id"
:disabled="isMetaLoading" :disabled="isMetaLoading"
:loading="isMetaLoading" :loading="isMetaLoading"
:placeholder="$t('placenc-to-seleholder.notSelected')" :placeholder="$t('placeholder.notSelected')"
class="!rounded-r-none ct" class="!rounded-r-none ct"
> >
<a-select-option <a-select-option
@ -1043,7 +1043,9 @@ const getPluralName = (name: string) => {
// If the fk_from_column_id of first range is Date, then all the other ranges should be Date // If the fk_from_column_id of first range is Date, then all the other ranges should be Date
// If the fk_from_column_id of first range is DateTime, then all the other ranges should be DateTime // If the fk_from_column_id of first range is DateTime, then all the other ranges should be DateTime
const firstRange = viewSelectFieldOptions.find((f) => f.value === form.calendar_range[0].fk_from_column_id) const firstRange = viewSelectFieldOptions.find(
(f) => f.value === form.calendar_range[0].fk_from_column_id,
)
return firstRange?.uidt === f.uidt return firstRange?.uidt === f.uidt
})" })"
:key="id" :key="id"
@ -1058,7 +1060,12 @@ const getPluralName = (name: string) => {
</div> </div>
</a-select-option> </a-select-option>
</NcSelect> </NcSelect>
<NcButton class="!rounded-l-none !border-l-0" size="small" type="secondary" @click="range.fk_to_column_id = null"> <NcButton
class="!rounded-l-none !border-l-0"
size="small"
type="secondary"
@click="range.fk_to_column_id = null"
>
<component :is="iconMap.delete" class="h-4 w-4" /> <component :is="iconMap.delete" class="h-4 w-4" />
</NcButton> </NcButton>
</div> </div>
@ -1075,13 +1082,12 @@ const getPluralName = (name: string) => {
<component :is="iconMap.close" /> <component :is="iconMap.close" />
</NcButton> </NcButton>
</template> </template>
</div> --> </div>
<!-- <NcButton class="mt-2" size="small" type="secondary" @click="addCalendarRange"> <!-- <NcButton class="mt-2" size="small" type="secondary" @click="addCalendarRange">
<component :is="iconMap.plus" /> <component :is="iconMap.plus" />
Add another date field Add another date field
</NcButton> --> </NcButton> -->
</div>
<div <div
v-if="isCalendarReadonly(form.calendar_range)" v-if="isCalendarReadonly(form.calendar_range)"

8
packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue

@ -134,12 +134,11 @@ const saveCalendarRanges = async () => {
} }
} }
/*
const removeRange = async (id: number) => { const removeRange = async (id: number) => {
_calendar_ranges.value = _calendar_ranges.value.filter((_, i) => i !== id) _calendar_ranges.value = _calendar_ranges.value.filter((_, i) => i !== id)
await saveCalendarRanges() await saveCalendarRanges()
} }
/*
const saveCalendarRange = async (range: CalendarRangeType, value?) => { const saveCalendarRange = async (range: CalendarRangeType, value?) => {
range.fk_to_column_id = value range.fk_to_column_id = value
await saveCalendarRanges() await saveCalendarRanges()
@ -177,7 +176,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
</NcTooltip> </NcTooltip>
<template #overlay> <template #overlay>
<div v-if="calendarRangeDropdown" class="w-98 space-y-6 rounded-2xl p-4" data-testid="nc-calendar-range-menu" @click.stop> <div v-if="calendarRangeDropdown" class="w-138 space-y-6 rounded-2xl p-6" data-testid="nc-calendar-range-menu" @click.stop>
<div <div
v-for="(range, id) in _calendar_ranges" v-for="(range, id) in _calendar_ranges"
:key="id" :key="id"
@ -223,7 +222,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
</a-select-option> </a-select-option>
</NcSelect> </NcSelect>
<!-- <div <div
v-if="range.fk_to_column_id === null && isEeUI" v-if="range.fk_to_column_id === null && isEeUI"
class="flex cursor-pointer flex text-gray-800 items-center gap-1" class="flex cursor-pointer flex text-gray-800 items-center gap-1"
data-testid="nc-calendar-range-add-end-date" data-testid="nc-calendar-range-add-end-date"
@ -271,7 +270,6 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
<NcButton v-if="id !== 0" size="small" type="secondary" @click="removeRange(id)"> <NcButton v-if="id !== 0" size="small" type="secondary" @click="removeRange(id)">
<component :is="iconMap.close" /> <component :is="iconMap.close" />
</NcButton> </NcButton>
-->
</div> </div>
<div v-if="!isSetup" class="flex items-center gap-2 !mt-2"> <div v-if="!isSetup" class="flex items-center gap-2 !mt-2">

Loading…
Cancel
Save