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

Merge branch 'nocodb:develop' into fix-lookup-filter

Browse Source
This commit is contained in:
ssweber
2025-03-08 15:44:28 -05:00
committed by GitHub
parent f381900d6d 83a664502d
commit 3c21d74e71
83 changed files with 844 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/nc-gui/utils/dataUtils.ts
View File

@@ -23,6 +23,7 @@ import type {
TableType,
} from 'nocodb-sdk'
import dayjs from 'dayjs'
import { timeFormatsObj } from '../components/smartsheet/grid/canvas/utils/cell'
import { isColumnRequiredAndNull } from './columnUtils'
export const isValidValue = (val: unknown) => {
@@ -513,9 +514,12 @@ export const getDateTimeValue = (modelValue: string | null, params: ParsePlainCe
return ''
}
const dateFormat = parseProp(col?.meta)?.date_format ?? dateFormats[0]
const timeFormat = parseProp(col?.meta)?.time_format ?? timeFormats[0]
const dateTimeFormat = `${dateFormat} ${timeFormat}`
const columnMeta = parseProp(col.meta)
const dateFormat = columnMeta?.date_format ?? dateFormats[0]
const timeFormat = columnMeta?.time_format ?? timeFormats[0]
const is12hrFormat = columnMeta?.is12hrFormat
const dateTimeFormat = `${dateFormat} ${is12hrFormat ? timeFormatsObj[timeFormat] : timeFormat}`
const isXcDB = isXcdbBase(col.source_id)