From 23a961db9a29c7beb9ebbec533e9005f39ab39cf Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Mon, 1 Aug 2022 22:09:08 +0530 Subject: [PATCH] fix/gui-v2-fixed-issue-with-time-picker --- packages/nc-gui-v2/components/cell/TimePicker.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui-v2/components/cell/TimePicker.vue b/packages/nc-gui-v2/components/cell/TimePicker.vue index 23b7d493fd..1e2fa406d0 100644 --- a/packages/nc-gui-v2/components/cell/TimePicker.vue +++ b/packages/nc-gui-v2/components/cell/TimePicker.vue @@ -22,13 +22,20 @@ const localState = $computed({ if (!modelValue) { return undefined } + let dateTime = dayjs(modelValue) - if (!dayjs(modelValue).isValid()) { + if (!dateTime.isValid()) { + dateTime = dayjs(modelValue, 'HH:mm:ss') + } + if (!dateTime.isValid()) { + dateTime = dayjs(`1999-01-01 ${modelValue}`) + } + if (!dateTime.isValid()) { isTimeInvalid = true return undefined } - return dayjs(modelValue) + return dateTime }, set(val?: dayjs.Dayjs) { if (!val) {