Skip to content

Commit ffe89f1

Browse files
ChanMenglinChanMenglin
committed
edit [b-date-picker]
1 parent 1098369 commit ffe89f1

File tree

5 files changed

+76
-65
lines changed

5 files changed

+76
-65
lines changed

‎src/components/base/DateTime/Date/Calendar/Cal/cal-year-panel.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
@date:checked="dateChecked"
2121
>
2222
<template #header>
23-
<p class="h6 text-primary">
24-
{{ moment([year, item.value, 1]).format("MMMM") }}
23+
<p class="h6 text-primary">
24+
{{ moment([year, item.value, 1]).format("MMMM") }}
2525
</p>
2626
</template>
2727
</date-date-panel>

‎src/components/base/DateTime/Date/DatePicker/b-date-picker.vue

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class=" p-0">
2+
<div class="p-0">
33
<b-dropdown-picker
44
ref="datepicekr"
55
class="form-control"
@@ -27,22 +27,22 @@
2727
</template>
2828
</b-dropdown-picker>
2929
<b-valid
30-
v-if="validInfo || $slots.valid"
31-
state="valid"
32-
>
33-
<slot name="valid">
34-
{{ validInfo }}
35-
</slot>
36-
</b-valid>
37-
<b-valid
38-
v-if="invalidInfo || $slots.invalid"
39-
state="invalid"
40-
>
41-
<slot name="invalid">
42-
{{ invalidInfo }}
43-
</slot>
44-
</b-valid>
45-
<b-info :info="info" />
30+
v-if="validInfo || $slots.valid"
31+
state="valid"
32+
>
33+
<slot name="valid">
34+
{{ validInfo }}
35+
</slot>
36+
</b-valid>
37+
<b-valid
38+
v-if="invalidInfo || $slots.invalid"
39+
state="invalid"
40+
>
41+
<slot name="invalid">
42+
{{ invalidInfo }}
43+
</slot>
44+
</b-valid>
45+
<b-info :info="info" />
4646
</div>
4747
</template>
4848

‎src/components/base/DateTime/Date/DatePicker/b-date-select.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ export default {
4444
prop: "value",
4545
event: "change",
4646
},
47+
props: {
48+
type: {
49+
type: String,
50+
default: "date",
51+
validator: value => ["year", "month", "date"].includes(value),
52+
},
53+
},
4754
data() {
4855
return {
4956
// 默认使用 selectedValueStart，

‎src/components/base/DropdownPicker/b-dropdown-picker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export default {
110110
},
111111
watch: {
112112
isShow: function(value) {
113-
if (!value) this.$emit('picekr:hide')
113+
if (!value) this.$emit('picker:hide')
114114
value
115115
? document.addEventListener("mousedown", this.hindeMenu)
116116
: document.removeEventListener("mousedown", this.hindeMenu)

‎src/pages/Demo/Base/b-datetime-demo.vue

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<h2>b-date-panel</h2>
44
<hr>
5-
<div class="row mx-0">
5+
<h4 class="row mx-0">
66
<font class="col-1">
77
type:
88
</font>
@@ -21,7 +21,7 @@
2121
<font class="col-2">
2222
date
2323
</font>
24-
</div>
24+
</h4>
2525
<div class="row mx-0">
2626
<font class="col-1">
2727
default
@@ -228,6 +228,8 @@
228228
</div>
229229
<h2>b-date-picker</h2>
230230
<hr>
231+
<h4>基本属性</h4>
232+
<br>
231233
<div class="row mx-0">
232234
<font class="col-1">
233235
default:
@@ -261,26 +263,63 @@
261263
placeholder="Place Check the Date"
262264
/>
263265
</div>
264-
<div class="row mx-0">
266+
<br>
267+
<h4>校验</h4>
268+
<br>
269+
<div class="row">
270+
<font class="col-1">
271+
required:
272+
</font>
273+
<b-date-picker
274+
class="col-11"
275+
required
276+
/>
277+
</div>
278+
<div class="row">
279+
<font class="col-1">
280+
success
281+
<br>error:
282+
</font>
283+
<b-date-picker
284+
class="col-11"
285+
invalid-info="error"
286+
valid-info="success"
287+
required
288+
/>
289+
</div>
290+
<div class="row">
291+
<font class="col-1">
292+
success
293+
<br>error(2):
294+
</font>
295+
<b-date-picker
296+
class="col-11"
297+
required
298+
>
299+
<template #invalid>
300+
you can add anlything invalidInfo or DOM
301+
</template>
302+
<template #valid>
303+
you can add anlything validInfo or DOM
304+
</template>
305+
</b-date-picker>
306+
</div>
307+
<br>
308+
<h4 class="row mx-0">
265309
<font class="col-1">
266310
type:
267311
</font>
268312
<font class="col-2">
269313
year
270314
</font>
271-
<font class="col-2">
272-
quarter
273-
</font>
274315
<font class="col-2">
275316
month
276317
</font>
277-
<font class="col-2">
278-
week
279-
</font>
280318
<font class="col-2">
281319
date
282320
</font>
283-
</div>
321+
</h4>
322+
<br>
284323
<div class="row mx-0">
285324
<font class="col-1">
286325
default:
@@ -289,18 +328,10 @@
289328
class="col-2"
290329
type="year"
291330
/>
292-
<b-date-picker
293-
class="col-2"
294-
type="quarter"
295-
/>
296331
<b-date-picker
297332
class="col-2"
298333
type="month"
299334
/>
300-
<b-date-picker
301-
class="col-2"
302-
type="week"
303-
/>
304335
<b-date-picker
305336
class="col-2"
306337
type="date"
@@ -315,21 +346,11 @@
315346
type="year"
316347
value="2018"
317348
/>
318-
<b-date-picker
319-
class="col-2"
320-
type="quarter"
321-
value="2018-03"
322-
/>
323349
<b-date-picker
324350
class="col-2"
325351
type="month"
326352
value="2018-03"
327353
/>
328-
<b-date-picker
329-
class="col-2"
330-
type="week"
331-
value="2018-03-05"
332-
/>
333354
<b-date-picker
334355
class="col-2"
335356
type="date"
@@ -347,25 +368,12 @@
347368
min="2018"
348369
max="2020"
349370
/>
350-
<b-date-picker
351-
class="col-2"
352-
type="quarter"
353-
min="2018-02"
354-
max="2019-09"
355-
/>
356371
<b-date-picker
357372
class="col-2"
358373
type="month"
359374
min="2018-02"
360375
max="2019-09"
361376
/>
362-
<b-date-picker
363-
class="col-2"
364-
type="week"
365-
min="2019-09-15"
366-
max="2019-09-30"
367-
info="info text"
368-
/>
369377
<b-date-picker
370378
class="col-2"
371379
type="date"
@@ -386,7 +394,6 @@
386394
type="year"
387395
/>
388396
</div>
389-
<div class="col-2" />
390397
<div class="col-2">
391398
{{ month }}:
392399
<br>
@@ -395,7 +402,6 @@
395402
type="month"
396403
/>
397404
</div>
398-
<div class="col-2" />
399405
<div class="col-2">
400406
{{ date }}:
401407
<br>
@@ -418,7 +424,6 @@
418424
range
419425
/>
420426
</div>
421-
<div class="col-2" />
422427
<div class="col-2">
423428
{{ monthR }}:
424429
<br>
@@ -428,7 +433,6 @@
428433
range
429434
/>
430435
</div>
431-
<div class="col-2" />
432436
<div class="col-2">
433437
{{ dateR }}:
434438
<br>

0 commit comments

Comments
 (0)