Skip to content

Commit 3df9556

Browse files
committed
wip: KDateTime does not correctly handle the min and max properties #1122 [build doc]
1 parent 8a8627a commit 3df9556

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

core/client/components/time/KDateTime.vue

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
<KDate
88
v-model="computedDateModel"
99
:picker="computedDatePicker"
10+
:format="dateFormat"
11+
:placeholder="placeholder"
1012
:icon="icon"
13+
:disabled="disabled"
1114
:dense="dense"
1215
:class="{ 'q-pl-xs': dense, 'q-pl-md': !dense, [dateClass]: true }"
1316
/>
@@ -16,8 +19,10 @@
1619
<!-- Time -->
1720
<KTime
1821
v-model="computedTimeModel"
19-
:icon="null"
2022
:picker="computedTimePicker"
23+
:with-seconds="withSeconds"
24+
:format="timeFormat"
25+
:icon="null"
2126
:disabled="disabled || dateTime === null"
2227
:dense="dense"
2328
:class="{ 'q-pr-xs': dense, 'q-pr-md': !dense, [timeClass]: true }"
@@ -152,7 +157,7 @@ const computedDatePicker = computed(() => {
152157
return _.merge({}, props.datePicker, picker)
153158
})
154159
const computedTimePicker = computed(() => {
155-
let picker = { withSeconds: props.withSeconds }
160+
let picker = {}
156161
if (!_.isEmpty(props.min) || !_.isEmpty(props.max)) picker = { options: checkTime }
157162
return _.merge({}, props.timePicker, picker)
158163
})

0 commit comments

Comments
 (0)