test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use dayjs for date field default value

Browse Source 
(cherry picked from commit 7bbac6c7035ffeb39d567f146f1aee283868e237)
This commit is contained in:
Shariq Ansari 2025-05-07 18:26:23 +05:30 committed by Mergify
parent af32cdf27a
commit c7e24d6760
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/components/Controls/Grid.vue
View File

@ -310,6 +310,7 @@ import {
DateTimePicker, DateTimePicker,
DatePicker, DatePicker,
Tooltip, Tooltip,
dayjs,
} from 'frappe-ui' } from 'frappe-ui'
import Draggable from 'vuedraggable' import Draggable from 'vuedraggable'
import { ref, reactive, computed, inject } from 'vue' import { ref, reactive, computed, inject } from 'vue'
@ -467,20 +468,20 @@ function getDefaultValue(defaultValue, fieldtype) {
} else if (fieldtype === 'Int') { } else if (fieldtype === 'Int') {
return parseInt(defaultValue) return parseInt(defaultValue)
} else if (defaultValue === 'Today' && fieldtype === 'Date') { } else if (defaultValue === 'Today' && fieldtype === 'Date') {
return getFormat(new Date(), '', true) return dayjs().format('YYYY-MM-DD')
} else if ( } else if (
['Now', 'now'].includes(defaultValue) && ['Now', 'now'].includes(defaultValue) &&
fieldtype === 'Datetime' fieldtype === 'Datetime'
) { ) {
return getFormat(new Date(), '', true, true) return dayjs().format('YYYY-MM-DD HH:mm:ss')
} else if (['Now', 'now'].includes(defaultValue) && fieldtype === 'Time') { } else if (['Now', 'now'].includes(defaultValue) && fieldtype === 'Time') {
return getFormat(new Date(), '', false, true) return dayjs().format('HH:mm:ss')
} else if (fieldtype === 'Date') { } else if (fieldtype === 'Date') {
return getFormat(defaultValue, '', true) return dayjs(defaultValue).format('YYYY-MM-DD')
} else if (fieldtype === 'Datetime') { } else if (fieldtype === 'Datetime') {
return getFormat(defaultValue, '', true, true) return dayjs(defaultValue).format('YYYY-MM-DD HH:mm:ss')
} else if (fieldtype === 'Time') { } else if (fieldtype === 'Time') {
return getFormat(defaultValue, '', false, true) return dayjs(defaultValue).format('HH:mm:ss')
} }
return defaultValue return defaultValue