Skip to content

Commit 2e6ba8f

Browse files
wedogrstoenescu
authored andcommitted
1 parent 6826002 commit 2e6ba8f

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

dev/components/form/datetime.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export default {
189189
data () {
190190
return {
191191
// model: '2016-09-18T10:45:00.000Z',
192-
model: undefined,
192+
model: 0,
193193
defaultSelection: '2016-09-18T10:45:00.000Z',
194194
195195
format: 'MMMM D, YYYY [at] h:mm [[]a[\\]]',

src/components/datetime/QDatetime.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default {
4848
if (this.displayValue) {
4949
return this.displayValue
5050
}
51-
if (!this.value) {
51+
if (this.value !== 0 && !this.value) {
5252
return this.placeholder || ''
5353
}
5454

@@ -124,7 +124,7 @@ export default {
124124
}
125125
},
126126
__setModel (val = this.value) {
127-
this.model = val
127+
this.model = val === 0 || val
128128
? clone(val)
129129
: this.defaultSelection
130130
},

src/components/datetime/datetime-mixin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
computed: {
1313
model: {
1414
get () {
15-
let date = this.value
15+
let date = this.value === 0 || this.value
1616
? new Date(this.value)
1717
: (this.defaultSelection ? new Date(this.defaultSelection) : startOfDate(new Date(), 'day'))
1818

src/utils/date.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ export const formatter = {
501501
}
502502

503503
export function formatDate (val, mask = 'YYYY-MM-DDTHH:mm:ss.SSSZ') {
504-
if (!val) {
504+
if (val !== 0 && !val) {
505505
return
506506
}
507507

@@ -516,3 +516,8 @@ export function formatDate (val, mask = 'YYYY-MM-DDTHH:mm:ss.SSSZ') {
516516
: text.split('\\]').join(']')
517517
})
518518
}
519+
520+
export function matchFormat (format) {
521+
format = format || ''
522+
return format.match(token)
523+
}

0 commit comments

Comments
 (0)