Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
82932c00
Commit
82932c00
authored
Jan 23, 2017
by
qingwei.li
Committed by
杨奕
Jan 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DatePicker: add range-separator prop, close #2568
parent
5e455f91
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
1 deletion
+9
-1
examples/docs/en-US/date-picker.md
examples/docs/en-US/date-picker.md
+1
-0
examples/docs/en-US/datetime-picker.md
examples/docs/en-US/datetime-picker.md
+1
-0
examples/docs/zh-CN/date-picker.md
examples/docs/zh-CN/date-picker.md
+1
-0
examples/docs/zh-CN/datetime-picker.md
examples/docs/zh-CN/datetime-picker.md
+1
-0
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+5
-1
No files found.
examples/docs/en-US/date-picker.md
View file @
82932c00
...
@@ -261,6 +261,7 @@ Picking a date range is supported.
...
@@ -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 |
...
...
examples/docs/en-US/datetime-picker.md
View file @
82932c00
...
@@ -216,6 +216,7 @@ Select date and time in one picker.
...
@@ -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 |
...
...
examples/docs/zh-CN/date-picker.md
View file @
82932c00
...
@@ -295,6 +295,7 @@
...
@@ -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
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
...
...
examples/docs/zh-CN/datetime-picker.md
View file @
82932c00
...
@@ -239,6 +239,7 @@
...
@@ -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
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
...
...
packages/date-picker/src/picker.vue
View file @
82932c00
...
@@ -43,7 +43,7 @@ const NewPopper = {
...
@@ -43,7 +43,7 @@ const NewPopper = {
beforeDestroy
:
Popper
.
beforeDestroy
beforeDestroy
:
Popper
.
beforeDestroy
};
};
cons
t
RANGE_SEPARATOR
=
'
-
'
;
le
t
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 {
...
@@ -202,6 +202,9 @@ export default {
default
:
'
left
'
default
:
'
left
'
},
},
value
:
{},
value
:
{},
rangeSeparator
:
{
default
:
'
-
'
},
pickerOptions
:
{}
pickerOptions
:
{}
},
},
...
@@ -324,6 +327,7 @@ export default {
...
@@ -324,6 +327,7 @@ export default {
},
},
created
()
{
created
()
{
RANGE_SEPARATOR
=
this
.
rangeSeparator
;
// vue-popper
// vue-popper
this
.
options
=
{
this
.
options
=
{
boundariesPadding
:
0
,
boundariesPadding
:
0
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment