feat(module:time-picker): support 12-hour with nzUse12Hours
#3127
Conversation
This file contains 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
add unit test on feature `support 12-hour`
Codecov Report
@@ Coverage Diff @@
## master #3127 +/- ##
==========================================
+ Coverage 97.37% 97.45% +0.07%
==========================================
Files 559 559
Lines 11627 11733 +106
Branches 835 859 +24
==========================================
+ Hits 11322 11434 +112
+ Misses 193 189 -4
+ Partials 112 110 -2
Continue to review full report at Codecov.
|
|
Deploy preview for ng-zorro-master ready! Built with commit 4fc833e |
kekehaoz
changed the title
nzUse12HoursnzUse12Hours
add test case in 12-hour feature in TimePicker
kekehaoz
changed the title
nzUse12HoursnzUse12Hours(#1513)
add unit test case on '12-hour' featrue
hsuanxyz
changed the title
nzUse12Hours(#1513)nzUse12Hours
|
Would not be better to handle it like “nzConvention=‘12’” and “nzConvention=‘24’”? |
To keep same with Ant Design of React |
add unit test case for 12-hour
…/ng-zorro-antd into feat/timePicker-support-12-hour
…/ng-zorro-antd into feat/timePicker-support-12-hour
kekehaoz
changed the title
nzUse12HoursnzUse12Hours
wilsoncook
requested changes
Apr 3, 2019
| @@ -201,6 +209,21 @@ export class NzTimePickerPanelComponent implements ControlValueAccessor, OnInit, | |||
| return this._nzSecondStep; | |||
| } | |||
|
|
|||
| @Input() | |||
| set nzUse12Hours(value: boolean) { | |||
There was a problem hiding this comment.
这里尽量不要使用getter/setter的方式，改用ngOnChanges中作变化检测吧
| @@ -49,6 +49,7 @@ export class NzTimePickerPanelComponent implements ControlValueAccessor, OnInit, | |||
| private _defaultOpenValue = new Date(); | |||
| private _opened = false; | |||
| private _allowEmpty = true; | |||
| private _nzUse12Hours = false; | |||
There was a problem hiding this comment.
替换掉getter/setter方式后，应该只需要使用 nzUse12Hours 变量即可
Replace getter/setter with ngOnChanges to implement nzUse12Hours
kekehaoz
force-pushed
the
feat/timePicker-support-12-hour
branch
from
1a2f2fe
to
913d314
Compare
wilsoncook
approved these changes
Apr 12, 2019
|
Thank you @wilsoncook ! |
|
All thanks to @kekehaoz |
|
My mistake, thanks @kekehaoz !! |
andrew-yangy
pushed a commit
to andrew-yangy/ng-zorro-antd
that referenced
this pull request
Jun 20, 2019
Ricbet
pushed a commit
to Ricbet/ng-zorro-antd
that referenced
this pull request
Apr 9, 2020
hsuanxyz
pushed a commit
to hsuanxyz/ng-zorro-antd
that referenced
this pull request
Aug 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR Checklist
Please check if your PR fulfills the following requirements:
PR Type
What kind of change does this PR introduce?
TimePicker support 12-hour
What is the current behavior?
Issue Number: #1513
What is the new behavior?
Does this PR introduce a breaking change?
Other information