Commit 5b7a40e9 authored by Dreamacro's avatar Dreamacro Committed by 杨奕

DateTimePicker: add timeformat for datetimerange (#6052)

* DateTimePicker: add timeformat for datetimerange

* fix
parent c340ed13
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
ref="minTimePicker" ref="minTimePicker"
:date="minDate" :date="minDate"
@pick="handleMinTimePick" @pick="handleMinTimePick"
:visible="minTimePickerVisible"> :visible="minTimePickerVisible"
@mounted="$refs.minTimePicker.format=timeFormat">
</time-picker> </time-picker>
</span> </span>
</span> </span>
...@@ -74,7 +75,9 @@ ...@@ -74,7 +75,9 @@
ref="maxTimePicker" ref="maxTimePicker"
:date="maxDate" :date="maxDate"
@pick="handleMaxTimePick" @pick="handleMaxTimePick"
:visible="maxTimePickerVisible"></time-picker> :visible="maxTimePickerVisible"
@mounted="$refs.maxTimePicker.format=timeFormat">
</time-picker>
</span> </span>
</span> </span>
</div> </div>
...@@ -213,6 +216,14 @@ ...@@ -213,6 +216,14 @@
newDate.setMonth(month + 1); newDate.setMonth(month + 1);
} }
return newDate; return newDate;
},
timeFormat() {
if (this.format && this.format.indexOf('ss') === -1) {
return 'HH:mm';
} else {
return 'HH:mm:ss';
}
} }
}, },
...@@ -238,7 +249,8 @@ ...@@ -238,7 +249,8 @@
firstDayOfWeek: 7, firstDayOfWeek: 7,
minTimePickerVisible: false, minTimePickerVisible: false,
maxTimePickerVisible: false, maxTimePickerVisible: false,
width: 0 width: 0,
format: ''
}; };
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment