diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue index 738bffc8d8..04e08f2bbb 100644 --- a/packages/nc-gui/components/cell/DatePicker.vue +++ b/packages/nc-gui/components/cell/DatePicker.vue @@ -83,7 +83,7 @@ watch( ) const placeholder = computed(() => { - if (isEditColumn.value && modelValue === null) { + if (isEditColumn.value && ( modelValue === '' || modelValue === null )) { return '(Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue index 9324dedd52..839bf1b330 100644 --- a/packages/nc-gui/components/cell/DateTimePicker.vue +++ b/packages/nc-gui/components/cell/DateTimePicker.vue @@ -136,7 +136,7 @@ watch( ) const placeholder = computed(() => { - if (isEditColumn.value && modelValue === null) { + if (isEditColumn.value && ( modelValue === '' || modelValue === null )) { return '(Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue index 31bb12a6ad..6cc1a62a3a 100644 --- a/packages/nc-gui/components/cell/TimePicker.vue +++ b/packages/nc-gui/components/cell/TimePicker.vue @@ -88,7 +88,7 @@ watch( ) const placeholder = computed(() => { - if (isEditColumn.value && modelValue === null) { + if (isEditColumn.value && ( modelValue === '' || modelValue === null )) { return '(Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue index 9bef5d711e..5afaf75c8f 100644 --- a/packages/nc-gui/components/cell/YearPicker.vue +++ b/packages/nc-gui/components/cell/YearPicker.vue @@ -75,8 +75,8 @@ watch( ) const placeholder = computed(() => { - if (isEditColumn.value && modelValue === null) { - return 'Select default year (Optional)' + if (isEditColumn.value && ( modelValue === '' || modelValue === null )) { + return '(Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' } else if (isYearInvalid.value) {