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

DatePicker: workaround for Chromium 55 - 57

pull/7853/head
Leopoldthecoder 2017-10-30 11:14:16 +08:00 committed by 杨奕
parent 468124f956
commit 146e02c4a3
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,6 +482,12 @@
this.onPick && this.onPick(val); this.onPick && this.onPick(val);
this.maxDate = val.maxDate; this.maxDate = val.maxDate;
this.minDate = val.minDate; this.minDate = val.minDate;
// workaround for https://github.com/ElemeFE/element/issues/7539, should remove this block when we don't have to care about Chromium 55 - 57
setTimeout(() => {
this.maxDate = val.maxDate;
this.minDate = val.minDate;
}, 10);
if (!close || this.showTime) return; if (!close || this.showTime) return;
this.handleConfirm(); this.handleConfirm();
}, },

6
packages/theme-chalk/src/date-picker/picker.scss
View File

@ -15,14 +15,14 @@
@include m((daterange, timerange)) { @include m((daterange, timerange)) {
&.el-input, &.el-input,
&.el-input__inner { &.el-input__inner {
width: 320px; width: 350px;
} }
} }
@include m(datetimerange) { @include m(datetimerange) {
&.el-input, &.el-input,
&.el-input__inner { &.el-input__inner {
width: 370px; width: 400px;
} }
} }
@ -42,7 +42,7 @@
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 38%; width: 39%;
text-align: center; text-align: center;
font-size: $--font-size-base; font-size: $--font-size-base;
color: $--color-text-regular; color: $--color-text-regular;

2
packages/theme-chalk/src/date-picker/time-spinner.scss
View File

@ -3,7 +3,7 @@
@include b(time-spinner) { @include b(time-spinner) {
&.has-seconds { &.has-seconds {
.el-time-spinner__wrapper { .el-time-spinner__wrapper {
width: 33%; width: 33.3%;
} }
.el-time-spinner__wrapper:nth-child(2) { .el-time-spinner__wrapper:nth-child(2) {