From 885bcab0d7c9ef6ddb7d5147971b1206bf711fd2 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 9 May 2023 19:54:44 +0800 Subject: [PATCH] fix(nc-gui): dont keep local time when getting but setting to localModelValue --- packages/nc-gui/components/cell/DateTimePicker.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue index e3f3d53c74..a9488e4e52 100644 --- a/packages/nc-gui/components/cell/DateTimePicker.vue +++ b/packages/nc-gui/components/cell/DateTimePicker.vue @@ -45,7 +45,7 @@ const dateTimeFormat = $computed(() => { return `${dateFormat} ${timeFormat}` }) -let localModelValue = modelValue ? dayjs(modelValue).utc(true).local() : undefined +let localModelValue = modelValue ? dayjs(modelValue).utc().local() : undefined let localState = $computed({ get() { @@ -79,7 +79,7 @@ let localState = $computed({ // when pasting a datetime cell, UTC (xcdb) will be saved in DB // we convert back to local time if (column.value.title! in (isUpdatedFromCopyNPaste ?? {})) { - localModelValue = dayjs(modelValue).utc().local() + localModelValue = dayjs(modelValue).utc(true).local() return localModelValue } @@ -94,7 +94,7 @@ let localState = $computed({ } // empty cell - use modelValue in local time - return dayjs(modelValue).utc(true).local() + return dayjs(modelValue).utc().local() }, set(val?: dayjs.Dayjs) { if (!val) {