feat(module: modal): support nzMask and nzMaskClosable global config
#3033
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
support global config `nzMask` and `nzMaskClosable`
(NG-ZORRO#1594) support global config `nzMask` and `nzMaskClosable`
Modal support `nzMask` and `nzMaskClosable` global configuration
kekehaoz
changed the title
nzMask and nzMaskClosable global config (#1594)
|
Deploy preview for ng-zorro-master ready! Built with commit 86858f1 |
Codecov Report
@@ Coverage Diff @@
## master #3033 +/- ##
==========================================
+ Coverage 97.37% 97.37% +<.01%
==========================================
Files 559 559
Lines 11627 11630 +3
Branches 835 837 +2
==========================================
+ Hits 11322 11325 +3
Misses 193 193
Partials 112 112
Continue to review full report at Codecov.
|
wilsoncook
requested changes
Mar 25, 2019
| @@ -80,6 +80,38 @@ export class NzModalComponent<T = any, R = any> extends NzModalRef<T, R> impleme | |||
| @Input() nzIconType: string = 'question-circle'; // Confirm Modal ONLY | |||
| @Input() nzModalType: ModalType = 'default'; | |||
|
|
|||
| @Input() @InputBoolean() | |||
| get nzMask(): boolean { | |||
There was a problem hiding this comment.
三个层级配置，就用三个不同变量对应，最后在用第四个变量来表示最终值，如：
get finalMask() {
if (this.nzMask != null) {
return this.nzMask;
} else if (this.modalConfig.nzMask) {
return this.modalConfig.nzMask
} else ...
}
kekehaoz
changed the title
nzMask and nzMaskClosable global config (#1594)nzMask and nzMaskClosable global config
kekehaoz
changed the title
nzMask and nzMaskClosable global confignzMask and nzMaskClosable global config
wilsoncook
requested changes
Mar 27, 2019
| @@ -113,6 +132,34 @@ export class NzModalComponent<T = any, R = any> extends NzModalRef<T, R> | |||
| return !this.nzVisible && !this.animationState; | |||
| } // Indicate whether this dialog should hidden | |||
|
|
|||
| /** the calculated highest weight of mask value | |||
| } | ||
|
|
||
| set nzMask(value: boolean) { | ||
| this._nzMask = value; |
…z/ng-zorro-antd into feat/modal-support-global-config
wilsoncook
requested changes
Apr 3, 2019
| @@ -125,6 +160,7 @@ export class NzModalComponent<T = any, R = any> extends NzModalRef<T, R> | |||
| private previouslyFocusedElement: HTMLElement; | |||
| private focusTrap: FocusTrap; | |||
| private scrollStrategy: BlockScrollStrategy; | |||
| private nzModalGlobalConfig: NzModalConfig; | |||
There was a problem hiding this comment.
这里不需要定义内部成员，统一写在constructor处即可，Optional() @Inject(NZ_MODAL_CONFIG) private nzModalGlobalConfig: NzModalConfig
wilsoncook
approved these changes
Apr 18, 2019
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?
What is the current behavior?
Issue Number: #1594
What is the new behavior?
Modal Module support global configuration which cover the default value of component
Does this PR introduce a breaking change?
Other information