drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct passing of confirm prop, correct initial values when no value is passed

Browse source
This commit is contained in:
Sergio Crisostomo 2018-02-05 10:01:19 +01:00
parent 732b32e451
commit 29a91fbb61
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/date-picker/base/time-spinner.vue
View file

@ -28,15 +28,15 @@
props: { props: {
hours: { hours: {
type: [Number, String], type: [Number, String],
default: 0 default: NaN
}, },
minutes: { minutes: {
type: [Number, String], type: [Number, String],
default: 0 default: NaN
}, },
seconds: { seconds: {
type: [Number, String], type: [Number, String],
default: 0 default: NaN
}, },
showSeconds: { showSeconds: {
type: Boolean, type: Boolean,

4
src/components/date-picker/panel/Date/date-panel-mixin.js
View file

@ -5,10 +5,6 @@ import {initTimeDate } from '../../util';
export default { export default {
props: { props: {
confirm: {
type: Boolean,
default: false
},
showTime: { showTime: {
type: Boolean, type: Boolean,
default: false default: false

15
src/components/date-picker/panel/Time/time-range.vue
View file

@ -10,9 +10,9 @@
ref="timeSpinner" ref="timeSpinner"
:steps="steps" :steps="steps"
:show-seconds="showSeconds" :show-seconds="showSeconds"
:hours="dateStart.getHours()" :hours="value[0] && dateStart.getHours()"
:minutes="dateStart.getMinutes()" :minutes="value[0] && dateStart.getMinutes()"
:seconds="dateStart.getSeconds()" :seconds="value[0] && dateStart.getSeconds()"
:disabled-hours="disabledHours" :disabled-hours="disabledHours"
:disabled-minutes="disabledMinutes" :disabled-minutes="disabledMinutes"
:disabled-seconds="disabledSeconds" :disabled-seconds="disabledSeconds"
@ -29,9 +29,9 @@
ref="timeSpinnerEnd" ref="timeSpinnerEnd"
:steps="steps" :steps="steps"
:show-seconds="showSeconds" :show-seconds="showSeconds"
:hours="dateEnd.getHours()" :hours="value[1] && dateEnd.getHours()"
:minutes="dateEnd.getMinutes()" :minutes="value[1] && dateEnd.getMinutes()"
:seconds="dateEnd.getSeconds()" :seconds="value[1] && dateEnd.getSeconds()"
:disabled-hours="disabledHours" :disabled-hours="disabledHours"
:disabled-minutes="disabledMinutes" :disabled-minutes="disabledMinutes"
:disabled-seconds="disabledSeconds" :disabled-seconds="disabledSeconds"
@ -87,8 +87,7 @@
timePrefixCls: timePrefixCls, timePrefixCls: timePrefixCls,
showDate: false, showDate: false,
dateStart: dateStart || initTimeDate(), dateStart: dateStart || initTimeDate(),
dateEnd: dateEnd || initTimeDate(), dateEnd: dateEnd || initTimeDate()
confirm: false
}; };
}, },
computed: { computed: {

9
src/components/date-picker/panel/Time/time.vue
View file

@ -7,9 +7,9 @@
ref="timeSpinner" ref="timeSpinner"
:show-seconds="showSeconds" :show-seconds="showSeconds"
:steps="steps" :steps="steps"
:hours="date.getHours()" :hours="value[0] && date.getHours()"
:minutes="date.getMinutes()" :minutes="value[0] && date.getMinutes()"
:seconds="date.getSeconds()" :seconds="value[0] && date.getSeconds()"
:disabled-hours="disabledHours" :disabled-hours="disabledHours"
:disabled-minutes="disabledMinutes" :disabled-minutes="disabledMinutes"
:disabled-seconds="disabledSeconds" :disabled-seconds="disabledSeconds"
@ -63,8 +63,7 @@
prefixCls: prefixCls, prefixCls: prefixCls,
timePrefixCls: timePrefixCls, timePrefixCls: timePrefixCls,
date: this.value[0] || initTimeDate(), date: this.value[0] || initTimeDate(),
showDate: false, showDate: false
confirm: false
}; };
}, },
computed: { computed: {

6
src/components/date-picker/panel/panel-mixin.js
View file

@ -2,6 +2,12 @@ const prefixCls = 'ivu-picker-panel';
const datePrefixCls = 'ivu-date-picker'; const datePrefixCls = 'ivu-date-picker';
export default { export default {
props: {
confirm: {
type: Boolean,
default: false
}
},
methods: { methods: {
iconBtnCls (direction, type = '') { iconBtnCls (direction, type = '') {
return [ return [