github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

DateTimePicker: limit timepicker (#6076) 

* fix: #5045

* fix: #5045
pull/6576/head
Dreamacro 2017-08-13 12:00:33 +08:00 committed by 杨奕
parent a5e5be3d7a
commit a1324324a2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/date-picker/src/panel/date.vue
View File

@ -265,6 +265,11 @@
oldDate.setHours(hour); oldDate.setHours(hour);
oldDate.setMinutes(minute); oldDate.setMinutes(minute);
oldDate.setSeconds(second); oldDate.setSeconds(second);
if (typeof this.disabledDate === 'function' && this.disabledDate(oldDate)) {
this.$refs.timepicker.disabled = true;
return;
}
this.$refs.timepicker.disabled = false;
this.date = new Date(oldDate.getTime()); this.date = new Date(oldDate.getTime());
} }

6
packages/date-picker/src/panel/time.vue
View File

@ -23,7 +23,8 @@
@click="handleCancel">{{ t('el.datepicker.cancel') }}</button> @click="handleCancel">{{ t('el.datepicker.cancel') }}</button>
<button <button
type="button" type="button"
class="el-time-panel__btn confirm" class="el-time-panel__btn"
:class="{confirm: !disabled}"
@click="handleConfirm()">{{ t('el.datepicker.confirm') }}</button> @click="handleConfirm()">{{ t('el.datepicker.confirm') }}</button>
</div> </div>
</div> </div>
@ -101,7 +102,8 @@
currentDate: this.$options.defaultValue || this.date || new Date(), currentDate: this.$options.defaultValue || this.date || new Date(),
currentVisible: this.visible || false, currentVisible: this.visible || false,
width: this.pickerWidth || 0, width: this.pickerWidth || 0,
selectionRange: [0, 2] selectionRange: [0, 2],
disabled: false
}; };
}, },