Browse Source

fix: handle rebase

pull/9831/head
DarkPhoenix2704 2 days ago
parent
commit
b539c79c23
  1. 4
      packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue

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

@ -239,7 +239,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
class="!border-none w-28" class="!border-none w-28"
type="secondary" type="secondary"
:shadow="false" :shadow="false"
:disabled="!isEeUI" :disabled="!isEeUI || isLocked"
@click="range.fk_to_column_id = undefined" @click="range.fk_to_column_id = undefined"
> >
<div class="flex gap-2 items-center"> <div class="flex gap-2 items-center">
@ -255,7 +255,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
<a-select <a-select
v-model:value="range.fk_to_column_id" v-model:value="range.fk_to_column_id"
class="!rounded-r-none nc-select-shadow w-full flex-1 nc-to-select" class="!rounded-r-none nc-select-shadow w-full flex-1 nc-to-select"
:disabled="!range.fk_from_column_id" :disabled="!range.fk_from_column_id || isLocked"
:placeholder="$t('placeholder.notSelected')" :placeholder="$t('placeholder.notSelected')"
data-testid="nc-calendar-range-to-field-select" data-testid="nc-calendar-range-to-field-select"
dropdown-class-name="!rounded-lg" dropdown-class-name="!rounded-lg"

Loading…
Cancel
Save