Commit e0cd7f909aee9f3d9eea6197d6cc66d6b2536f78
1 parent
6e572d44
fixed #134
fixed #134
Showing
5 changed files
with
36 additions
and
11 deletions
Show diff stats
src/components/date-picker/panel/date-range.vue
| 1 | <template> | 1 | <template> |
| 2 | + <div :class="classes"> | ||
| 2 | 3 | ||
| 4 | + </div> | ||
| 3 | </template> | 5 | </template> |
| 4 | <script> | 6 | <script> |
| 7 | + const prefixCls = 'ivu-picker-panel'; | ||
| 8 | + const datePrefixCls = 'ivu-date-picker'; | ||
| 9 | + | ||
| 5 | export default { | 10 | export default { |
| 6 | props: {}, | 11 | props: {}, |
| 7 | data () { | 12 | data () { |
| 8 | return {} | 13 | return {} |
| 9 | }, | 14 | }, |
| 10 | - computed: {}, | 15 | + computed: { |
| 16 | + classes () { | ||
| 17 | + return [ | ||
| 18 | + `${prefixCls}-body-wrapper`, | ||
| 19 | + { | ||
| 20 | + [`${prefixCls}-with-sidebar`]: this.shortcuts.length | ||
| 21 | + } | ||
| 22 | + ] | ||
| 23 | + } | ||
| 24 | + }, | ||
| 11 | methods: {} | 25 | methods: {} |
| 12 | } | 26 | } |
| 13 | </script> | 27 | </script> |
| 14 | \ No newline at end of file | 28 | \ No newline at end of file |
src/components/date-picker/picker/date-picker.js
| @@ -16,7 +16,7 @@ export default { | @@ -16,7 +16,7 @@ export default { | ||
| 16 | props: { | 16 | props: { |
| 17 | type: { | 17 | type: { |
| 18 | validator (value) { | 18 | validator (value) { |
| 19 | - return oneOf(value, ['year', 'month', 'week', 'date', 'daterange', 'datetime', 'datetimerange']); | 19 | + return oneOf(value, ['year', 'month', 'date', 'daterange', 'datetime', 'datetimerange']); |
| 20 | }, | 20 | }, |
| 21 | default: 'date' | 21 | default: 'date' |
| 22 | }, | 22 | }, |
src/components/page/page.vue
| 1 | <template> | 1 | <template> |
| 2 | - <ul :class="simpleWrapClasses" v-if="simple"> | 2 | + <ul :class="simpleWrapClasses" :style="style" v-if="simple"> |
| 3 | <li | 3 | <li |
| 4 | title="上一页" | 4 | title="上一页" |
| 5 | :class="prevClasses" | 5 | :class="prevClasses" |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | <a><i class="ivu-icon ivu-icon-ios-arrow-right"></i></a> | 23 | <a><i class="ivu-icon ivu-icon-ios-arrow-right"></i></a> |
| 24 | </li> | 24 | </li> |
| 25 | </ul> | 25 | </ul> |
| 26 | - <ul :class="wrapClasses" v-else> | 26 | + <ul :class="wrapClasses" :style="style" v-else> |
| 27 | <span :class="[prefixCls + '-total']" v-if="showTotal"> | 27 | <span :class="[prefixCls + '-total']" v-if="showTotal"> |
| 28 | <slot>共 {{ total }} 条</slot> | 28 | <slot>共 {{ total }} 条</slot> |
| 29 | </span> | 29 | </span> |
| @@ -109,6 +109,12 @@ | @@ -109,6 +109,12 @@ | ||
| 109 | showSizer: { | 109 | showSizer: { |
| 110 | type: Boolean, | 110 | type: Boolean, |
| 111 | default: false | 111 | default: false |
| 112 | + }, | ||
| 113 | + class: { | ||
| 114 | + type: String | ||
| 115 | + }, | ||
| 116 | + style: { | ||
| 117 | + type: Object | ||
| 112 | } | 118 | } |
| 113 | }, | 119 | }, |
| 114 | data () { | 120 | data () { |
| @@ -127,7 +133,10 @@ | @@ -127,7 +133,10 @@ | ||
| 127 | simpleWrapClasses () { | 133 | simpleWrapClasses () { |
| 128 | return [ | 134 | return [ |
| 129 | `${prefixCls}`, | 135 | `${prefixCls}`, |
| 130 | - `${prefixCls}-simple` | 136 | + `${prefixCls}-simple`, |
| 137 | + { | ||
| 138 | + [`${this.class}`]: !!this.class | ||
| 139 | + } | ||
| 131 | ] | 140 | ] |
| 132 | }, | 141 | }, |
| 133 | simplePagerClasses () { | 142 | simplePagerClasses () { |
| @@ -137,6 +146,7 @@ | @@ -137,6 +146,7 @@ | ||
| 137 | return [ | 146 | return [ |
| 138 | `${prefixCls}`, | 147 | `${prefixCls}`, |
| 139 | { | 148 | { |
| 149 | + [`${this.class}`]: !!this.class, | ||
| 140 | 'mini': !!this.size | 150 | 'mini': !!this.size |
| 141 | } | 151 | } |
| 142 | ] | 152 | ] |
test/routers/date.vue
| @@ -15,10 +15,7 @@ | @@ -15,10 +15,7 @@ | ||
| 15 | @on-open-change="change2"></date-picker> | 15 | @on-open-change="change2"></date-picker> |
| 16 | </i-col> | 16 | </i-col> |
| 17 | <i-col span="8"> | 17 | <i-col span="8"> |
| 18 | - <date-picker type="year" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker> | ||
| 19 | - </i-col> | ||
| 20 | - <i-col span="8"> | ||
| 21 | - <date-picker type="month" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker> | 18 | + <date-picker type="daterange" style="width:200px" placeholder="请选择日期" :value.sync="value2" :options="options2"></date-picker> |
| 22 | </i-col> | 19 | </i-col> |
| 23 | </row> | 20 | </row> |
| 24 | </div> | 21 | </div> |
| @@ -29,6 +26,10 @@ | @@ -29,6 +26,10 @@ | ||
| 29 | return { | 26 | return { |
| 30 | // value: new Date(), | 27 | // value: new Date(), |
| 31 | value: '2016-12-25', | 28 | value: '2016-12-25', |
| 29 | + value2: '', | ||
| 30 | + options2: { | ||
| 31 | + | ||
| 32 | + }, | ||
| 32 | options: { | 33 | options: { |
| 33 | disabledDate(time) { | 34 | disabledDate(time) { |
| 34 | // console.log(time) | 35 | // console.log(time) |
test/routers/page.vue
| 1 | <template> | 1 | <template> |
| 2 | - <Page :total="1000" show-sizer show-elevator show-total></Page> | 2 | + <Page :total="1000" show-sizer show-elevator show-total class="classr" :style="{float: 'right'}"></Page> |
| 3 | <br><br> | 3 | <br><br> |
| 4 | - <Page :total="1000" show-sizer show-elevator show-total size="small"></Page> | 4 | + <Page :total="1000" show-sizer show-elevator show-total size="small" class="classr2"></Page> |
| 5 | <br><br> | 5 | <br><br> |
| 6 | <Page :current="2" :total="50" simple></Page> | 6 | <Page :current="2" :total="50" simple></Page> |
| 7 | </template> | 7 | </template> |