diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts index 796209df15..45492c3dad 100644 --- a/packages/nocodb/src/services/datas.service.ts +++ b/packages/nocodb/src/services/datas.service.ts @@ -1,5 +1,5 @@ import { Injectable, Logger } from '@nestjs/common'; -import { isSystemColumn } from 'nocodb-sdk'; +import { isSystemColumn, ViewTypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; import papaparse from 'papaparse'; import { nocoExecute } from 'nc-help'; @@ -164,6 +164,16 @@ export class DatasService { listArgs.sortArr = JSON.parse(listArgs.sortArrJson); } catch (e) {} + let options = {}; + + if (view.type === ViewTypes.CALENDAR) { + { + options = { + ignorePagination: true, + }; + } + } + const [count, data] = await Promise.all([ baseModel.count(listArgs, false, param.throwErrorIfInvalidParams), (async () => { @@ -174,6 +184,7 @@ export class DatasService { await baseModel.list(listArgs, { ignoreViewFilterAndSort, throwErrorIfInvalidParams: param.throwErrorIfInvalidParams, + ...options, }), {}, listArgs, diff --git a/packages/nocodb/src/services/public-datas.service.ts b/packages/nocodb/src/services/public-datas.service.ts index a45e500086..8c00f29d49 100644 --- a/packages/nocodb/src/services/public-datas.service.ts +++ b/packages/nocodb/src/services/public-datas.service.ts @@ -74,10 +74,17 @@ export class PublicDatasService { let data = []; let count = 0; + let option = {}; + if (view.type === ViewTypes.CALENDAR) { + option = { + ignorePagination: true, + }; + } + try { data = await nocoExecute( ast, - await baseModel.list(listArgs), + await baseModel.list(listArgs, option), {}, listArgs, );