Commit e55f00ff7ed42ad5a196be554eecad511a0ba45d
1 parent
2533a192
update DatePicker
update DatePicker
Showing
2 changed files
with
16 additions
and
7 deletions
Show diff stats
src/styles/components/date-picker.less
| @@ -183,11 +183,19 @@ | @@ -183,11 +183,19 @@ | ||
| 183 | position: absolute; | 183 | position: absolute; |
| 184 | top: 0; | 184 | top: 0; |
| 185 | bottom: 0; | 185 | bottom: 0; |
| 186 | - background: @border-color-split; | 186 | + background: @table-thead-bg; |
| 187 | + border-right: 1px solid @border-color-split; | ||
| 187 | border-radius: @border-radius-small 0 0 @border-radius-small; | 188 | border-radius: @border-radius-small 0 0 @border-radius-small; |
| 189 | + overflow: auto; | ||
| 188 | } | 190 | } |
| 189 | &-shortcut{ | 191 | &-shortcut{ |
| 192 | + padding: @btn-padding-large; | ||
| 193 | + transition: all @transition-time @ease-in-out; | ||
| 194 | + cursor: pointer; | ||
| 190 | 195 | ||
| 196 | + &:hover{ | ||
| 197 | + background: @border-color-split; | ||
| 198 | + } | ||
| 191 | } | 199 | } |
| 192 | &-body{ | 200 | &-body{ |
| 193 | float: left; | 201 | float: left; |
test/routers/date.vue
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | data () { | 27 | data () { |
| 28 | return { | 28 | return { |
| 29 | // value: new Date(), | 29 | // value: new Date(), |
| 30 | - value: '', | 30 | + value: '2016-12-25', |
| 31 | options: { | 31 | options: { |
| 32 | disabledDate(time) { | 32 | disabledDate(time) { |
| 33 | // console.log(time) | 33 | // console.log(time) |
| @@ -39,9 +39,10 @@ | @@ -39,9 +39,10 @@ | ||
| 39 | { | 39 | { |
| 40 | text: '今天', | 40 | text: '今天', |
| 41 | value () { | 41 | value () { |
| 42 | - return new Date(); | 42 | +// return new Date(); |
| 43 | + return '1/2/19' | ||
| 43 | }, | 44 | }, |
| 44 | - onClick () { | 45 | + onClick (picker) { |
| 45 | console.log('点击了今天'); | 46 | console.log('点击了今天'); |
| 46 | } | 47 | } |
| 47 | }, | 48 | }, |
| @@ -63,9 +64,9 @@ | @@ -63,9 +64,9 @@ | ||
| 63 | date.setTime(date.getTime() - 3600 * 1000 * 24 * 7); | 64 | date.setTime(date.getTime() - 3600 * 1000 * 24 * 7); |
| 64 | return date; | 65 | return date; |
| 65 | }, | 66 | }, |
| 66 | -// onClick () { | ||
| 67 | -// console.log('点击了一周前'); | ||
| 68 | -// } | 67 | + onClick () { |
| 68 | + console.log('点击了一周前'); | ||
| 69 | + } | ||
| 69 | } | 70 | } |
| 70 | ] | 71 | ] |
| 71 | }, | 72 | }, |