|
@@ -41,7 +41,8 @@
|
|
:date="date"
|
|
:date="date"
|
|
:picker-width="pickerWidth"
|
|
:picker-width="pickerWidth"
|
|
@pick="handleTimePick"
|
|
@pick="handleTimePick"
|
|
- :visible="timePickerVisible">
|
|
|
|
|
|
+ :visible="timePickerVisible"
|
|
|
|
+ @mounted="$refs.timepicker.format=timeFormat">
|
|
</time-picker>
|
|
</time-picker>
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
@@ -371,7 +372,8 @@
|
|
week: null,
|
|
week: null,
|
|
showWeekNumber: false,
|
|
showWeekNumber: false,
|
|
timePickerVisible: false,
|
|
timePickerVisible: false,
|
|
- width: 0
|
|
|
|
|
|
+ width: 0,
|
|
|
|
+ format: ''
|
|
};
|
|
};
|
|
},
|
|
},
|
|
|
|
|
|
@@ -382,12 +384,12 @@
|
|
|
|
|
|
visibleTime: {
|
|
visibleTime: {
|
|
get() {
|
|
get() {
|
|
- return formatDate(this.date, 'HH:mm:ss');
|
|
|
|
|
|
+ return formatDate(this.date, this.timeFormat);
|
|
},
|
|
},
|
|
|
|
|
|
set(val) {
|
|
set(val) {
|
|
if (val) {
|
|
if (val) {
|
|
- const date = parseDate(val, 'HH:mm:ss');
|
|
|
|
|
|
+ const date = parseDate(val, this.timeFormat);
|
|
if (date) {
|
|
if (date) {
|
|
date.setFullYear(this.date.getFullYear());
|
|
date.setFullYear(this.date.getFullYear());
|
|
date.setMonth(this.date.getMonth());
|
|
date.setMonth(this.date.getMonth());
|
|
@@ -433,6 +435,14 @@
|
|
return startYear + ' - ' + (startYear + 9);
|
|
return startYear + ' - ' + (startYear + 9);
|
|
}
|
|
}
|
|
return this.year + ' ' + yearTranslation;
|
|
return this.year + ' ' + yearTranslation;
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+ timeFormat() {
|
|
|
|
+ if (this.format && this.format.indexOf('ss') === -1) {
|
|
|
|
+ return 'HH:mm';
|
|
|
|
+ } else {
|
|
|
|
+ return 'HH:mm:ss';
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
};
|