Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(module: date-picker-view): feat indicatorStyle #104

Merged
merged 4 commits into from
Nov 14, 2018
Merged

feat(module: date-picker-view): feat indicatorStyle #104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a69088
feat(module: date-picker-view): feat indicatorStyle
Guoyuanqiang Nov 10, 2018
3b70095
docs(module:date-picker-view): delete zh-CN in en-US
Guoyuanqiang Nov 13, 2018
4327990
Merge branch 'master' into guoyq1
3fuyu Nov 14, 2018
b48e307
Merge branch 'master' into guoyq1
fisherspy Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/date-picker-view/date-picker-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div *ngFor="let item of dataWithStr; let i = index" class="am-picker-col">
<div class="am-picker-col-indicator " style="top: 102px;"></div>
<div class="am-picker-col-indicator " style="top: 102px;" [ngStyle]="indicatorStyle"></div>
<div id={{i}} class="am-picker-col-mask" style="background-size: 100% 102px;"></div>
<div class="am-picker-col-content">
<div id={{i}} *ngFor="let val of item; let i = index" class="am-picker-col-item">{{val.label?val.label:val}}</div>
Expand Down
2 changes: 2 additions & 0 deletions components/date-picker-view/date-picker-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export class DatePickerViewComponent extends DatePickerComponent implements OnIn
@Input()
disabled: boolean = false;
@Input()
indicatorStyle: object = {};
@Input()
get locale() {
return this.options.locale;
}
Expand Down
1 change: 1 addition & 0 deletions components/date-picker-view/doc/index.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ Properties | Descrition | Type | Default
| disabled | 是否不可用 | Boolean | false |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please translate note "是否不可用" in en-US

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as abtd-mobile

Suggested change
| disabled | 是否不可用 | Boolean | false |
| disabled | 是否不可用 | Boolean | false |

| onChange | change handler | (date: Object): void | - |
| onValueChange | fire when picker col change | (vals: any, index: number) => void | - |
| indicatorStyle | style of indicator | Object | - |
1 change: 1 addition & 0 deletions components/date-picker-view/doc/index.zh-CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ DatePickerView 的功能类似于 DatePicker ，但它是直接渲染在区域
| disabled | 是否不可用 | Boolean | false |
| onChange | 时间发生变化的回调函数 | (date: Object): void | - |
| onValueChange | 每列 picker 改变时的回调 | (vals: any, index: number) => void | - |
| indicatorStyle | style of indicator | Object | - |