diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx index 3cc9a7ddb4..605fb775d9 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx @@ -186,7 +186,7 @@ export const calendarBlockSettings = new SchemaSettings({ return { title: t('Start date field'), value: fieldNames.start, - options: getCollectionFieldsOptions(name, 'date', { + options: getCollectionFieldsOptions(name, ['date', 'datetime', 'dateOnly', 'datetimeNoTz', 'unixTimestamp'], { association: ['o2o', 'obo', 'oho', 'm2o'], }), onChange: (start) => { @@ -221,7 +221,7 @@ export const calendarBlockSettings = new SchemaSettings({ return { title: t('End date field'), value: fieldNames.end, - options: getCollectionFieldsOptions(name, ['date', 'datetime', 'dateOnly', 'datetimeNoTz'], { + options: getCollectionFieldsOptions(name, ['date', 'datetime', 'dateOnly', 'datetimeNoTz', 'unixTimestamp'], { association: ['o2o', 'obo', 'oho', 'm2o'], }), onChange: (end) => { diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx index 64e937dd61..c575c779e8 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx @@ -70,10 +70,14 @@ export const useCreateCalendarBlock = () => { const createCalendarBlock = async ({ item }) => { const stringFieldsOptions = getCollectionFieldsOptions(item.name, 'string', { dataSource: item.dataSource }); - const dateFieldsOptions = getCollectionFieldsOptions(item.name, ['date', 'datetime', 'dateOnly', 'datetimeNoTz'], { - association: ['o2o', 'obo', 'oho', 'm2o'], - dataSource: item.dataSource, - }); + const dateFieldsOptions = getCollectionFieldsOptions( + item.name, + ['date', 'datetime', 'dateOnly', 'datetimeNoTz', 'unixTimestamp'], + { + association: ['o2o', 'obo', 'oho', 'm2o'], + dataSource: item.dataSource, + }, + ); const values = await FormDialog( t('Create calendar block'),