-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
datePicker 添加默认渲染slot支持 #957
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
tangjinzhou
merged 2 commits into
vueComponent:master
from
cxdmaye:branch-datepicker-upgrade
Jul 16, 2019
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -409,6 +409,7 @@ export default { | |
openChange: this.handleOpenChange, | ||
}, | ||
style: popupStyle, | ||
scopedSlots: $scopedSlots.default ? $scopedSlots : null, | ||
}, | ||
); | ||
return ( | ||
|
@@ -422,7 +423,7 @@ export default { | |
onMouseenter={this.onMouseEnter} | ||
onMouseleave={this.onMouseLeave} | ||
> | ||
<VcDatePicker {...vcDatePickerProps}>{input}</VcDatePicker> | ||
<VcDatePicker {...vcDatePickerProps}>{$scopedSlots.default ? '' : input}</VcDatePicker> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 全部挂载到 |
||
</span> | ||
); | ||
}, | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
|
||
<cn> | ||
#### 自定义渲染 | ||
增加选择时间功能,当 `showTime` 为一个对象时,其属性会传递给内建的 `TimePicker`。 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 介绍没更改 中英都是 |
||
</cn> | ||
|
||
<us> | ||
#### Custum Time | ||
This property provide an additional time selection. When `showTime` is an Object, its properties will be passed on to built-in `TimePicker`. | ||
</us> | ||
|
||
```html | ||
<template> | ||
<div> | ||
<a-date-picker | ||
placeholder="Select Time" | ||
v-model="time1" | ||
@change="onChange" | ||
@ok="onOk" | ||
> | ||
<span>{{time1?time1:'SelectTime'}}</span> | ||
</a-date-picker> | ||
<br /> | ||
<a-range-picker v-model="time2"> | ||
<span> | ||
{{time2?time2:'请选择'}} | ||
</span> | ||
</a-range-picker> | ||
</div> | ||
</template> | ||
<script> | ||
import moment from 'moment' | ||
export default { | ||
data(){ | ||
return { | ||
time1:undefined, | ||
time2:undefined | ||
} | ||
}, | ||
methods: { | ||
onChange(value, dateString) { | ||
console.log('Selected Time: ', value); | ||
console.log('Formatted Selected Time: ', dateString); | ||
}, | ||
onOk(value) { | ||
console.log('onOk: ', value); | ||
}, | ||
clearTime(){ | ||
this.time1 = undefined | ||
} | ||
} | ||
} | ||
</script> | ||
``` | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
可以直接这样
scopedSlots: { default: input, ...this.$scopedSlots },