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

fixed Layout bug

Browse source 
fixed Layout bug
This commit is contained in:
梁灏 2016-12-26 14:50:39 +08:00
parent c6fecfd476
commit 9d844d5318
9 changed files with 281 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/date-picker/picker.vue
View file

@ -200,7 +200,10 @@
return this.open === null ? this.visible : this.open;
},
iconType () {
return this.showClose ? 'ios-close' : 'ios-calendar-outline';
let icon = 'ios-calendar-outline';
if (this.type === 'time') icon = 'ios-clock-outline';
if (this.showClose) icon = 'ios-close';
return icon;
},
transition () {
if (this.placement === 'bottom-start' || this.placement === 'bottom' || this.placement === 'bottom-end') {
@ -341,6 +344,12 @@
this.picker.selectionMode = this.selectionMode;
if (this.format) this.picker.format = this.format;
// TimePicker
if (this.disabledHours) this.picker.disabledHours = this.disabledHours;
if (this.disabledMinutes) this.picker.disabledMinutes = this.disabledMinutes;
if (this.disabledSeconds) this.picker.disabledSeconds = this.disabledSeconds;
if (this.hideDisabledOptions) this.picker.hideDisabledOptions = this.hideDisabledOptions;
const options = this.options;
for (const option in options) {
this.picker[option] = options[option];