From c835be96b36f714f7655133e3f576d8cf9ac9818 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:23:00 +0000 Subject: [PATCH] fix(nc-gui): copy paste datetime with unknown format --- .../nc-gui/composables/useMultiSelect/convertCellData.ts | 9 +++------ packages/nocodb-sdk/src/lib/dateTimeHelper.ts | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/nc-gui/composables/useMultiSelect/convertCellData.ts b/packages/nc-gui/composables/useMultiSelect/convertCellData.ts index 2a1885f4be..995d82229b 100644 --- a/packages/nc-gui/composables/useMultiSelect/convertCellData.ts +++ b/packages/nc-gui/composables/useMultiSelect/convertCellData.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs' import type { AttachmentType, ColumnType, LinkToAnotherRecordType, SelectOptionsType } from 'nocodb-sdk' -import { UITypes, getDateFormat, populateUniqueFileName, validateDateWithUnknownFormat } from 'nocodb-sdk' +import { UITypes, getDateFormat, getDateTimeFormat, populateUniqueFileName, validateDateWithUnknownFormat } from 'nocodb-sdk' import type { AppInfo } from '~/composables/useGlobal' import { isBt, isMm, parseProp } from '#imports' @@ -67,11 +67,8 @@ export default function convertCellData( return parsedDate.format('YYYY-MM-DD') } case UITypes.DateTime: { - const parsedDateTime = dayjs( - value, - `${parseProp(column?.meta)?.date_format ?? 'YYYY-MM-DD'} ${parseProp(column?.meta)?.time_format ?? 'HH:mm'}`, - ) - if (!parsedDateTime.isValid()) { + const parsedDateTime = dayjs(value, getDateTimeFormat(value)) + if (!(validateDateWithUnknownFormat(value) && parsedDateTime.isValid())) { if (isMultiple) { return null } else { diff --git a/packages/nocodb-sdk/src/lib/dateTimeHelper.ts b/packages/nocodb-sdk/src/lib/dateTimeHelper.ts index e0652f13b3..1c75886faf 100644 --- a/packages/nocodb-sdk/src/lib/dateTimeHelper.ts +++ b/packages/nocodb-sdk/src/lib/dateTimeHelper.ts @@ -64,7 +64,7 @@ export function getDateTimeFormat(v: string) { } } } - return 'YYYY/MM/DD'; + return 'YYYY/MM/DD HH:mm'; } export function parseStringDate(v: string, dateFormat: string) {