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

DatePicker: add range-separator prop, close #2568

pull/1084/merge
qingwei.li 2017-01-23 15:35:06 +08:00 committed by 杨奕
parent 5e455f911f
commit 82932c0040
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/docs/en-US/date-picker.md
View File

@ -261,6 +261,7 @@ Picking a date range is supported.
| align | alignment | left/center/right | left | | align | alignment | left/center/right | left |
| popper-class | custom class name for DatePicker's dropdown | string | — | — | | popper-class | custom class name for DatePicker's dropdown | string | — | — |
| picker-options | additional options, check the table below | object | — | {} | | picker-options | additional options, check the table below | object | — | {} |
| range-separator | range separator | string | - | ' - ' |
### Picker Options ### Picker Options
| Attribute | Description | Type | Accepted Values | Default | | Attribute | Description | Type | Accepted Values | Default |

1
examples/docs/en-US/datetime-picker.md
View File

@ -216,6 +216,7 @@ Select date and time in one picker.
| align | alignment | left/center/right | left | | align | alignment | left/center/right | left |
| popper-class | custom class name for DateTimePicker's dropdown | string | — | — | | popper-class | custom class name for DateTimePicker's dropdown | string | — | — |
| picker-options | additional options, check the table below | object | — | {} | | picker-options | additional options, check the table below | object | — | {} |
| range-separator | range separator | string | - | ' - ' |
### Picker Options ### Picker Options
| Attribute | Description | Type | Accepted Values | Default | | Attribute | Description | Type | Accepted Values | Default |

1
examples/docs/zh-CN/date-picker.md
View File

@ -295,6 +295,7 @@
| align | 对齐方式 | string | left, center, right | left | | align | 对齐方式 | string | left, center, right | left |
| popper-class | DatePicker 下拉框的类名 | string | — | — | | popper-class | DatePicker 下拉框的类名 | string | — | — |
|picker-options | 当前时间日期选择器特有的选项参考下表 | object | — | {} | |picker-options | 当前时间日期选择器特有的选项参考下表 | object | — | {} |
| range-separator | 选择范围时的分隔符 | string | - | ' - ' |
### Picker Options ### Picker Options
| 参数 | 说明 | 类型 | 可选值 | 默认值 | | 参数 | 说明 | 类型 | 可选值 | 默认值 |

1
examples/docs/zh-CN/datetime-picker.md
View File

@ -239,6 +239,7 @@
| align | 对齐方式 | string | left, center, right | left | | align | 对齐方式 | string | left, center, right | left |
| popper-class | DateTimePicker 下拉框的类名 | string | — | — | | popper-class | DateTimePicker 下拉框的类名 | string | — | — |
| picker-options | 当前时间日期选择器特有的选项参考下表 | object | — | {} | | picker-options | 当前时间日期选择器特有的选项参考下表 | object | — | {} |
| range-separator | 选择范围时的分隔符 | string | - | ' - ' |
### Picker Options ### Picker Options
| 参数 | 说明 | 类型 | 可选值 | 默认值 | | 参数 | 说明 | 类型 | 可选值 | 默认值 |

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

@ -43,7 +43,7 @@ const NewPopper = {
beforeDestroy: Popper.beforeDestroy beforeDestroy: Popper.beforeDestroy
}; };
const RANGE_SEPARATOR = ' - '; let RANGE_SEPARATOR = ' - ';
const DEFAULT_FORMATS = { const DEFAULT_FORMATS = {
date: 'yyyy-MM-dd', date: 'yyyy-MM-dd',
month: 'yyyy-MM', month: 'yyyy-MM',
@ -202,6 +202,9 @@ export default {
default: 'left' default: 'left'
}, },
value: {}, value: {},
rangeSeparator: {
default: ' - '
},
pickerOptions: {} pickerOptions: {}
}, },
@ -324,6 +327,7 @@ export default {
}, },
created() { created() {
RANGE_SEPARATOR = this.rangeSeparator;
// vue-popper // vue-popper
this.options = { this.options = {
boundariesPadding: 0, boundariesPadding: 0,