forked from github/dataease
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
ca133ccc64
@ -15,6 +15,7 @@
|
|||||||
:size="size"
|
:size="size"
|
||||||
:editable="false"
|
:editable="false"
|
||||||
:picker-options="pickerOptions"
|
:picker-options="pickerOptions"
|
||||||
|
:default-time="defaultRangeTime"
|
||||||
@change="dateChange"
|
@change="dateChange"
|
||||||
@focus="toFocus"
|
@focus="toFocus"
|
||||||
@blur="onBlur"
|
@blur="onBlur"
|
||||||
@ -119,6 +120,12 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
|
},
|
||||||
|
defaultRangeTime() {
|
||||||
|
if (this.element.options.attrs.type === 'daterange' && this.element.options.attrs.showTime) {
|
||||||
|
return ['00:00:00', '23:59:59']
|
||||||
|
}
|
||||||
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user