clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-05-01 15:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/formula-empty-result

Browse Source
This commit is contained in:
Wing-Kam Wong
2022-12-21 23:18:12 +08:00
parent 4cef10222d bda3132a74
commit a8efff9fa0
20 changed files with 759 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/nc-gui/utils/dateTimeUtils.ts
View File

@@ -5,17 +5,19 @@ export const timeAgo = (date: any) => {
}
export const dateFormats = [
'YYYY-MM-DD',
'YYYY/MM/DD',
'DD-MM-YYYY',
'MM-DD-YYYY',
'YYYY-MM-DD',
'DD/MM/YYYY',
'MM/DD/YYYY',
'YYYY/MM/DD',
'DD MM YYYY',
'MM DD YYYY',
'YYYY MM DD',
]
export const timeFormats = ['HH:mm', 'HH:mm:ss']
export const handleTZ = (val: any) => {
if (val === undefined || val === null) {
return
@@ -60,7 +62,7 @@ export function getDateFormat(v: string) {
export function getDateTimeFormat(v: string) {
for (const format of dateFormats) {
for (const timeFormat of ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']) {
for (const timeFormat of timeFormats) {
const dateTimeFormat = `${format} ${timeFormat}`
if (dayjs(v, dateTimeFormat, true).isValid() as any) {
return dateTimeFormat