Browse Source

fix(nc-gui): view filters not applying

pull/7753/head
DarkPhoenix2704 9 months ago
parent
commit
e808dd2b9f
  1. 2
      packages/nc-gui/components/dlg/ViewCreate.vue
  2. 2
      packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
  3. 2
      packages/nc-gui/composables/useCalendarViewStore.ts
  4. 1
      packages/nocodb/src/services/calendar-datas.service.ts

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

@ -317,7 +317,7 @@ onMounted(async () => {
<template> <template>
<NcModal <NcModal
v-model:visible="vModel" v-model:visible="vModel"
:size="[ViewTypes.KANBAN, ViewTypes.MAP, ViewTypes.CALENDAR].includes(form.type) ? 'medium' : 'small'" :size="[ViewTypes.KANBAN, ViewTypes.MAP, ViewTypes.CALENDAR].includes(form.type) ? 'small' : 'small'"
> >
<template #header> <template #header>
<div class="flex w-full flex-row justify-between items-center"> <div class="flex w-full flex-row justify-between items-center">

2
packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue

@ -130,7 +130,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
</a-button> </a-button>
</div> </div>
<template #overlay> <template #overlay>
<div v-if="calendarRangeDropdown" class="w-full p-6 w-[25rem]" data-testid="nc-calendar-range-menu" @click.stop> <div v-if="calendarRangeDropdown" class="w-full p-6 w-[23rem]" 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"

2
packages/nc-gui/composables/useCalendarViewStore.ts

@ -119,7 +119,7 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
const calDataType = computed(() => { const calDataType = computed(() => {
if (!calendarRange.value || !calendarRange.value[0]) return null if (!calendarRange.value || !calendarRange.value[0]) return null
return calendarRange.value[0]!.fk_from_col!.uidt return calendarRange.value[0]?.fk_from_col?.uidt
}) })
const sideBarFilter = computed(() => { const sideBarFilter = computed(() => {

1
packages/nocodb/src/services/calendar-datas.service.ts

@ -53,6 +53,7 @@ export class CalendarDatasService {
return await this.datasService.dataList({ return await this.datasService.dataList({
...param, ...param,
...query, ...query,
viewName: view.id,
baseName: model.base_id, baseName: model.base_id,
tableName: model.id, tableName: model.id,
calendarLimitOverride: 3000, // TODO: make this configurable in env calendarLimitOverride: 3000, // TODO: make this configurable in env

Loading…
Cancel
Save