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

update TimePicker css

Browse source 
update TimePicker css
This commit is contained in:
梁灏 2017-01-03 11:52:22 +08:00
parent 420ef34349
commit 7c4c9d9ce9
3 changed files with 11 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/date-picker/base/time-spinner.vue
View file

@ -175,12 +175,10 @@
}, },
updateScroll () { updateScroll () {
const times = ['hours', 'minutes', 'seconds']; const times = ['hours', 'minutes', 'seconds'];
times.forEach(type => this.$els[type].style.overflow = 'hidden');
this.$nextTick(() => { this.$nextTick(() => {
times.forEach(type => { times.forEach(type => {
this.$els[type].scrollTop = 24 * this.getScrollIndex(type, this[type]); this.$els[type].scrollTop = 24 * this.getScrollIndex(type, this[type]);
}); });
this.$nextTick(() => times.forEach(type => this.$els[type].style.overflow = 'auto'));
}); });
}, },
formatTime (text) { formatTime (text) {

12
src/styles/components/time-picker.less
View file

@ -15,11 +15,15 @@
&-list{ &-list{
width: @time-picker-cells-width-base; width: @time-picker-cells-width-base;
float: left;
position: relative;
max-height: 144px; max-height: 144px;
overflow-y: auto; float: left;
overflow: hidden;
border-left: 1px solid @border-color-split; border-left: 1px solid @border-color-split;
position: relative;
&:hover{
overflow-y: auto;
}
&:first-child{ &:first-child{
border-left: none; border-left: none;
border-radius: @btn-border-radius 0 0 @btn-border-radius; border-radius: @btn-border-radius 0 0 @btn-border-radius;
@ -38,7 +42,7 @@
line-height: 24px; line-height: 24px;
margin: 0; margin: 0;
padding: 0 0 0 16px; padding: 0 0 0 16px;
box-sizing: border-box; box-sizing: content-box;
text-align: left; text-align: left;
user-select: none; user-select: none;
cursor: pointer; cursor: pointer;

71
test/routers/date.vue
View file

@ -1,10 +1,10 @@
<template> <template>
<row> <row>
<i-col span="12"> <i-col span="12">
<Date-picker type="datetime" :options="options1" placeholder="选择日期" style="width: 200px"></Date-picker> <Time-picker :value="val" type="time" placeholder="选择时间" style="width: 168px"></Time-picker>
</i-col> </i-col>
<i-col span="12"> <i-col span="12">
<Date-picker type="datetimerange" :options="options2" placement="bottom-end" placeholder="选择日期" style="width: 200px"></Date-picker> <Time-picker type="timerange" placement="bottom-end" placeholder="选择时间" style="width: 168px"></Time-picker>
</i-col> </i-col>
</row> </row>
</template> </template>
@ -12,72 +12,7 @@
export default { export default {
data () { data () {
return { return {
options1: { val: new Date
shortcuts: [
{
text: '今天',
value () {
return new Date();
},
onClick: (picker) => {
this.$Message.info('点击了今天');
}
},
{
text: '昨天',
value () {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
return date;
},
onClick: (picker) => {
this.$Message.info('点击了昨天');
}
},
{
text: '一周前',
value () {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
return date;
},
onClick: (picker) => {
this.$Message.info('点击了一周前');
}
}
]
},
options2: {
shortcuts: [
{
text: '最近一周',
value () {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
}
},
{
text: '最近一个月',
value () {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
}
},
{
text: '最近三个月',
value () {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
}
}
]
}
} }
} }
} }