Skip to content

Commit fde17aa

Browse files
rstoenescurstoenescu
committed
feat(QDate): further work
1 parent 461260b commit fde17aa

File tree

8 files changed

+84
-26
lines changed

8 files changed

+84
-26
lines changed

‎docs/src/examples/QDate/Input.vue‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<template v-slot:append>
55
<q-icon name="event" class="cursor-pointer">
66
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
7-
<q-date v-model="date" @input="() => $refs.qDateProxy.hide()" />
7+
<q-date v-model="date">
8+
<div class="row items-center justify-end">
9+
<q-btn v-close-popup label="Close" color="primary" flat />
10+
</div>
11+
</q-date>
812
</q-popup-proxy>
913
</q-icon>
1014
</template>

‎docs/src/examples/QDate/InputFull.vue‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
<template v-slot:prepend>
55
<q-icon name="event" class="cursor-pointer">
66
<q-popup-proxy transition-show="scale" transition-hide="scale">
7-
<q-date v-model="date" mask="YYYY-MM-DD HH:mm" />
7+
<q-date v-model="date" mask="YYYY-MM-DD HH:mm">
8+
<div class="row items-center justify-end">
9+
<q-btn v-close-popup label="Close" color="primary" flat />
10+
</div>
11+
</q-date>
812
</q-popup-proxy>
913
</q-icon>
1014
</template>
1115

1216
<template v-slot:append>
1317
<q-icon name="access_time" class="cursor-pointer">
1418
<q-popup-proxy transition-show="scale" transition-hide="scale">
15-
<q-time v-model="date" mask="YYYY-MM-DD HH:mm" format24h />
19+
<q-time v-model="date" mask="YYYY-MM-DD HH:mm" format24h>
20+
<div class="row items-center justify-end">
21+
<q-btn v-close-popup label="Close" color="primary" flat />
22+
</div>
23+
</q-time>
1624
</q-popup-proxy>
1725
</q-icon>
1826
</template>

‎docs/src/examples/QTime/Input.vue‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
<template v-slot:append>
66
<q-icon name="access_time" class="cursor-pointer">
77
<q-popup-proxy transition-show="scale" transition-hide="scale">
8-
<q-time v-model="time" />
8+
<q-time v-model="time">
9+
<div class="row items-center justify-end">
10+
<q-btn v-close-popup label="Close" color="primary" flat />
11+
</div>
12+
</q-time>
913
</q-popup-proxy>
1014
</q-icon>
1115
</template>
@@ -19,7 +23,11 @@
1923
v-model="timeWithSeconds"
2024
with-seconds
2125
format24h
22-
/>
26+
>
27+
<div class="row items-center justify-end">
28+
<q-btn v-close-popup label="Close" color="primary" flat />
29+
</div>
30+
</q-time>
2331
</q-popup-proxy>
2432
</q-icon>
2533
</template>

‎docs/src/examples/QTime/InputFull.vue‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
<template v-slot:prepend>
55
<q-icon name="event" class="cursor-pointer">
66
<q-popup-proxy transition-show="scale" transition-hide="scale">
7-
<q-date v-model="date" mask="YYYY-MM-DD HH:mm" />
7+
<q-date v-model="date" mask="YYYY-MM-DD HH:mm">
8+
<div class="row items-center justify-end">
9+
<q-btn v-close-popup label="Close" color="primary" flat />
10+
</div>
11+
</q-date>
812
</q-popup-proxy>
913
</q-icon>
1014
</template>
1115

1216
<template v-slot:append>
1317
<q-icon name="access_time" class="cursor-pointer">
1418
<q-popup-proxy transition-show="scale" transition-hide="scale">
15-
<q-time v-model="date" mask="YYYY-MM-DD HH:mm" format24h />
19+
<q-time v-model="date" mask="YYYY-MM-DD HH:mm" format24h>
20+
<div class="row items-center justify-end">
21+
<q-btn v-close-popup label="Close" color="primary" flat />
22+
</div>
23+
</q-time>
1624
</q-popup-proxy>
1725
</q-icon>
1826
</template>

‎ui/dev/src/pages/form/date-part1-basic.vue‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,11 @@
232232
v-model="input"
233233
v-bind="props"
234234
:style="style"
235-
/>
235+
>
236+
<div class="row items-center justify-end">
237+
<q-btn v-close-popup label="Close" color="primary" flat />
238+
</div>
239+
</q-date>
236240
</q-popup-proxy>
237241
</q-icon>
238242
</q-input>
@@ -252,7 +256,7 @@
252256
mask="YYYY-MM-DD HH:mm"
253257
today-btn
254258
:style="style"
255-
@input="() => $refs.qDateProxy1.hide()"
259+
@input="() => { $refs.qDateProxy1.hide() }"
256260
/>
257261
</q-popup-proxy>
258262
</q-icon>
@@ -261,7 +265,7 @@
261265
<q-time
262266
v-model="inputFull"
263267
mask="YYYY-MM-DD HH:mm"
264-
@input="() => $refs.qDateProxy2.hide()"
268+
@input="() => { $refs.qDateProxy2.hide() }"
265269
/>
266270
</q-popup-proxy>
267271
</q-icon>
@@ -271,25 +275,25 @@
271275
<q-input :dark="dark" filled v-model="inputFull">
272276
<template v-slot:append>
273277
<q-icon name="event" class="cursor-pointer" @click.prevent>
274-
<q-popup-proxy ref="qDateProxy1">
278+
<q-popup-proxy ref="qDateProxy3">
275279
<q-date
276280
v-model="inputFull"
277281
v-bind="props"
278282
mask="YYYY-MM-DD HH:mm"
279283
today-btn
280284
:style="style"
281-
@input="() => $refs.qDateProxy1.hide()"
285+
@input="() => { $refs.qDateProxy3.hide() }"
282286
/>
283287
</q-popup-proxy>
284288
</q-icon>
285289
</template>
286290
<template v-slot:after>
287291
<q-icon name="access_time" class="cursor-pointer" @click.prevent>
288-
<q-popup-proxy ref="qDateProxy2">
292+
<q-popup-proxy ref="qDateProxy4">
289293
<q-time
290294
v-model="inputFull"
291295
mask="YYYY-MM-DD HH:mm"
292-
@input="() => $refs.qDateProxy2.hide()"
296+
@input="() => { $refs.qDateProxy4.hide() }"
293297
/>
294298
</q-popup-proxy>
295299
</q-icon>
@@ -299,26 +303,26 @@
299303
<q-input :dark="dark" filled v-model="inputFull" label="Default view - Years">
300304
<template v-slot:append>
301305
<q-icon name="event" class="cursor-pointer" @click.prevent>
302-
<q-popup-proxy ref="qDateProxy1">
306+
<q-popup-proxy ref="qDateProxy5">
303307
<q-date
304308
v-model="inputFull"
305309
v-bind="props"
306310
mask="YYYY-MM-DD HH:mm"
307311
today-btn
308312
default-view="Years"
309313
:style="style"
310-
@input="() => $refs.qDateProxy1.hide()"
314+
@input="() => { $refs.qDateProxy5.hide() }"
311315
/>
312316
</q-popup-proxy>
313317
</q-icon>
314318
</template>
315319
<template v-slot:after>
316320
<q-icon name="access_time" class="cursor-pointer" @click.prevent>
317-
<q-popup-proxy ref="qDateProxy2">
321+
<q-popup-proxy ref="qDateProxy6">
318322
<q-time
319323
v-model="inputFull"
320324
mask="YYYY-MM-DD HH:mm"
321-
@input="() => $refs.qDateProxy2.hide()"
325+
@input="() => { $refs.qDateProxy6.hide() }"
322326
/>
323327
</q-popup-proxy>
324328
</q-icon>

‎ui/dev/src/pages/form/date-time-timezone.vue‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
<template v-slot:prepend>
55
<q-icon name="event" class="cursor-pointer">
66
<q-popup-proxy transition-show="scale" transition-hide="scale">
7-
<q-date v-model="date1" mask="YYYY-MM-DD HH:mm:ssZ" />
7+
<q-date v-model="date1" mask="YYYY-MM-DD HH:mm:ssZ">
8+
<div class="row items-center justify-end q-gutter-sm">
9+
<q-btn v-close-popup label="Close" color="primary" flat />
10+
</div>
11+
</q-date>
812
</q-popup-proxy>
913
</q-icon>
1014
</template>
1115

1216
<template v-slot:append>
1317
<q-icon name="access_time" class="cursor-pointer">
1418
<q-popup-proxy transition-show="scale" transition-hide="scale">
15-
<q-time v-model="date1" mask="YYYY-MM-DD HH:mm:ssZ" format24h with-seconds />
19+
<q-time v-model="date1" mask="YYYY-MM-DD HH:mm:ssZ" format24h with-seconds>
20+
<div class="row items-center justify-end q-gutter-sm">
21+
<q-btn v-close-popup label="Close" color="primary" flat />
22+
</div>
23+
</q-time>
1624
</q-popup-proxy>
1725
</q-icon>
1826
</template>
@@ -22,15 +30,23 @@
2230
<template v-slot:prepend>
2331
<q-icon name="event" class="cursor-pointer">
2432
<q-popup-proxy transition-show="scale" transition-hide="scale">
25-
<q-date v-model="date2" mask="YYYY-MM-DD HH:mm ZZ" />
33+
<q-date v-model="date2" mask="YYYY-MM-DD HH:mm ZZ">
34+
<div class="row items-center justify-end q-gutter-sm">
35+
<q-btn v-close-popup label="Close" color="primary" flat />
36+
</div>
37+
</q-date>
2638
</q-popup-proxy>
2739
</q-icon>
2840
</template>
2941

3042
<template v-slot:append>
3143
<q-icon name="access_time" class="cursor-pointer">
3244
<q-popup-proxy transition-show="scale" transition-hide="scale">
33-
<q-time v-model="date2" mask="YYYY-MM-DD HH:mm ZZ" format24h />
45+
<q-time v-model="date2" mask="YYYY-MM-DD HH:mm ZZ" format24h>
46+
<div class="row items-center justify-end q-gutter-sm">
47+
<q-btn v-close-popup label="Close" color="primary" flat />
48+
</div>
49+
</q-time>
3450
</q-popup-proxy>
3551
</q-icon>
3652
</template>
@@ -40,15 +56,23 @@
4056
<template v-slot:prepend>
4157
<q-icon name="event" class="cursor-pointer">
4258
<q-popup-proxy transition-show="scale" transition-hide="scale">
43-
<q-date v-model="date3" mask="YYYY-MM-DD HH:mm" />
59+
<q-date v-model="date3" mask="YYYY-MM-DD HH:mm">
60+
<div class="row items-center justify-end">
61+
<q-btn v-close-popup label="Close" color="primary" flat />
62+
</div>
63+
</q-date>
4464
</q-popup-proxy>
4565
</q-icon>
4666
</template>
4767

4868
<template v-slot:append>
4969
<q-icon name="access_time" class="cursor-pointer">
5070
<q-popup-proxy transition-show="scale" transition-hide="scale">
51-
<q-time v-model="date3" mask="YYYY-MM-DD HH:mm" format24h />
71+
<q-time v-model="date3" mask="YYYY-MM-DD HH:mm" format24h>
72+
<div class="row items-center justify-end">
73+
<q-btn v-close-popup label="Close" color="primary" flat />
74+
</div>
75+
</q-time>
5276
</q-popup-proxy>
5377
</q-icon>
5478
</template>

‎ui/src/components/date/QDate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"reason": {
168168
"type": "String",
169169
"desc": "Reason of the user interaction (what was picked)",
170-
"values": [ "add-day", "remove-day", "add-range", "remove-range" ]
170+
"values": [ "add-day", "remove-day", "add-range", "remove-range", "mask", "locale" ]
171171
},
172172
"details": {
173173
"type": "Object",

‎ui/src/mixins/datetime.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import DarkMixin from './dark.js'
44
import FormMixin from './form.js'
55
import ListenersMixin from './listeners.js'
66

7+
const calendars = [ 'gregorian', 'persian' ]
8+
79
export default {
810
mixins: [ DarkMixin, FormMixin, ListenersMixin ],
911

@@ -19,7 +21,7 @@ export default {
1921

2022
calendar: {
2123
type: String,
22-
validator: v => ['gregorian', 'persian'].includes(v),
24+
validator: v => calendars.includes(v),
2325
default: 'gregorian'
2426
},
2527

0 commit comments

Comments
 (0)