diff --git a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
index 1aacdf4228..dc172b97cc 100644
--- a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
@@ -159,11 +159,11 @@ async function onOpenModal({
-
Calendar
+
{{$t('objects.viewType.calendar')}}
-
+
diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index 0e3a1446bd..7eb99b2d83 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -1,12 +1,13 @@
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index ca3f0ed28f..57afc5bece 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -42,19 +42,23 @@ const isDayInPagedMonth = (date: dayjs.Dayjs) => {
}
const dragElement = ref(null)
+
const draggingId = ref(null)
const resizeInProgress = ref(false)
const isDragging = ref(false)
+
const dragRecord = ref()
const hoverRecord = ref()
+
const dragTimeout = ref>()
const focusedDate = ref(null)
const resizeDirection = ref<'right' | 'left'>()
+
const resizeRecord = ref()
const dates = computed(() => {
diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index fca3751e76..591cdfad33 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -21,6 +21,7 @@ withDefaults(defineProps(), {
})
const emit = defineEmits(['resize-start'])
+
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index b8d84d4c6b..229c71239a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -311,7 +311,7 @@ onUnmounted(() => {
v-model:active-dates="activeDates"
v-model:page-date="pageDate"
v-model:selected-week="selectedDateRange"
- week-picker
+ is-week-picker
/>
{
v-else-if="activeCalendarView === ('year' as const)"
v-model:page-date="pageDate"
v-model:selected-date="selectedDate"
- year-picker
+ is-year-picker
/>
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index d9c346fbad..358c51f71e 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -202,9 +202,11 @@ const resizeInProgress = ref(false)
const dragTimeout = ref>()
const isDragging = ref(false)
+
const dragRecord = ref()
const resizeDirection = ref<'right' | 'left' | null>()
+
const resizeRecord = ref(null)
const hoverRecord = ref()
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 6ff226f366..4f2f3d0914 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -321,9 +321,11 @@ const dragTimeout = ref>()
const hoverRecord = ref()
const resizeDirection = ref<'right' | 'left' | null>()
+
const resizeRecord = ref()
const isDragging = ref(false)
+
const dragRecord = ref()
const useDebouncedRowUpdate = useDebounceFn((row: Row, updateProperty: string[], isDelete: boolean) => {
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index 4ed26fcd0d..50977327bd 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -25,6 +25,7 @@ const meta = inject(MetaInj, ref())
const view = inject(ActiveViewInj, ref())
const reloadViewMetaHook = inject(ReloadViewMetaHookInj)
+
const reloadViewDataHook = inject(ReloadViewDataHookInj)
const { isMobileMode } = useGlobal()
@@ -58,6 +59,7 @@ const {
const calendarRangeDropdown = ref(false)
const router = useRouter()
+
const route = useRoute()
const expandedFormOnRowIdDlg = computed({
@@ -76,7 +78,9 @@ const expandedFormOnRowIdDlg = computed({
})
const expandedFormDlg = ref(false)
+
const expandedFormRow = ref()
+
const expandedFormRowState = ref>()
const expandRecord = (row: RowType, state?: Record) => {
@@ -122,6 +126,7 @@ onMounted(async () => {
reloadViewMetaHook?.on(async () => {
await loadCalendarMeta()
})
+
reloadViewDataHook?.on(async () => {
await Promise.all([loadCalendarData(), loadSidebarData()])
})
@@ -185,7 +190,7 @@ const headerText = computed(() => {
v-model:active-dates="activeDates"
v-model:page-date="pageDate"
v-model:selected-week="selectedDateRange"
- week-picker
+ is-week-picker
/>
{
v-else-if="activeCalendarView === ('year' as const)"
v-model:page-date="pageDate"
v-model:selected-date="selectedDate"
- year-picker
+ is-year-picker
/>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 03755c4222..dc7b649403 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -425,6 +425,7 @@
}
},
"labels": {
+ "selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
"metadataUrl": "Metadata URL",