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.

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

fix(module: tree): fix nzBlockNode not work #5507

Merged
merged 2 commits into from
Jul 14, 2020

Conversation

tirelyl
Copy link
Contributor

@tirelyl tirelyl commented Jul 2, 2020

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

[x] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Application (the showcase website) / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

@tirelyl tirelyl requested a review from simplejason as a code owner July 2, 2020 13:06
@zorro-bot
Copy link

zorro-bot bot commented Jul 2, 2020

This preview will be available after the AzureCI is passed.

@tirelyl
Copy link
Contributor Author

tirelyl commented Jul 2, 2020

nzSelectMode 这个属性我看文档上是没有的,通过查看 8.0 版本和 react 版本做出的修改,但是还是不确定这样的修改对不对

@codecov
Copy link

codecov bot commented Jul 2, 2020

Codecov Report

Merging #5507 into master will increase coverage by 0.06%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5507      +/-   ##
==========================================
+ Coverage   91.16%   91.22%   +0.06%     
==========================================
  Files         453      454       +1     
  Lines       13902    13953      +51     
  Branches     2211     2219       +8     
==========================================
+ Hits        12674    12729      +55     
+ Misses        728      719       -9     
- Partials      500      505       +5     
Impacted Files Coverage Δ
components/tree/tree.component.ts 94.31% <ø> (ø)
components/core/config/config.service.ts 97.05% <0.00%> (-2.95%) ⬇️
components/core/services/scroll.ts 68.75% <0.00%> (-1.84%) ⬇️
components/table/src/table-style.service.ts 94.82% <0.00%> (-1.73%) ⬇️
components/tooltip/tooltip.ts 100.00% <0.00%> (ø)
components/affix/affix.module.ts 100.00% <0.00%> (ø)
components/anchor/anchor.module.ts 100.00% <0.00%> (ø)
components/resizable/demo/basic.ts 100.00% <0.00%> (ø)
components/popconfirm/popconfirm.ts 100.00% <0.00%> (ø)
components/back-top/back-top.module.ts 100.00% <0.00%> (ø)
... and 22 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 20b3d6b...144e6f8. Read the comment docs.

@simplejason
Copy link
Member

nzSelectMode

Thanks for your PR, nzSelectMode is used by nz-tree-select, I will review it ASAP.

@tirelyl
Copy link
Contributor Author

tirelyl commented Jul 9, 2020

nzSelectMode

Thanks for your PR, nzSelectMode is used by nz-tree-select, I will review it ASAP.

ok, if this is true, i'll add test later

Copy link
Member

@simplejason simplejason left a comment

Choose a reason for hiding this comment

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

You just need to change [class.ant-tree-list-holder-inner]="nzSelectMode" to [class.ant-tree-list-holder-inner]="!nzSelectMode"

[class.ant-select-tree-list-holder-inner]="nzSelectMode"
[class.ant-tree-list-holder-inner]="nzSelectMode"
Copy link
Member

Choose a reason for hiding this comment

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

Only needs to change [class.ant-tree-list-holder-inner]="nzSelectMode" to [class.ant-tree-list-holder-inner]="!nzSelectMode", the className of blocknode follows .ant-tree.ant-tree-block-node .ant-tree-list-holder-inner .ant-tree-node-content-wrapper

[class.ant-select-tree-list-holder-inner]="nzSelectMode"
[class.ant-tree-list-holder-inner]="nzSelectMode"
Copy link
Member

@simplejason simplejason Jul 9, 2020

Choose a reason for hiding this comment

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

same with above

@simplejason simplejason merged commit 5337652 into NG-ZORRO:master Jul 14, 2020
@tirelyl tirelyl deleted the fix-tree-nzBlockNode branch July 15, 2020 02:24
hsuanxyz pushed a commit to hsuanxyz/ng-zorro-antd that referenced this pull request Aug 5, 2020
* fix(module: tree): fix nzBlockNode not work

* test: add test for nzBlockNode
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants