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

feat(module:tree, tree-select): support customize icons #2933

Merged
merged 16 commits into from
Apr 15, 2019
Merged

feat(module:tree, tree-select): support customize icons #2933

merged 16 commits into from
Apr 15, 2019

Conversation

danranVm
Copy link
Member

@danranVm danranVm commented Feb 19, 2019

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

[ ] Bugfix
[x] 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: #2890 #2503

What is the new behavior?

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

@codecov
Copy link

codecov bot commented Feb 19, 2019

Codecov Report

Merging #2933 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2933      +/-   ##
==========================================
+ Coverage   97.38%   97.38%   +<.01%     
==========================================
  Files         559      559              
  Lines       11634    11639       +5     
  Branches      835      835              
==========================================
+ Hits        11330    11335       +5     
  Misses        193      193              
  Partials      111      111
Impacted Files Coverage Δ
components/tree/nz-tree.module.ts 100% <ø> (ø) ⬆️
components/tree/nz-tree.component.ts 98.78% <100%> (ø) ⬆️
components/tree/nz-tree-node.component.ts 97.18% <100%> (+0.04%) ⬆️
components/tree-select/nz-tree-select.component.ts 99.48% <100%> (ø) ⬆️
...te-picker/lib/popups/date-range-popup.component.ts 97.29% <100%> (ø) ⬆️

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 d81b2f6...076400e. Read the comment docs.

@netlify
Copy link

netlify bot commented Feb 19, 2019

Deploy preview for ng-zorro-master ready!

Built with commit 076400e

https://deploy-preview-2933--ng-zorro-master.netlify.com

components/tree/nz-tree.component.ts Outdated Show resolved Hide resolved
components/tree/nz-tree-node.component.html Outdated Show resolved Hide resolved
@hsuanxyz hsuanxyz changed the title feat(module:tree and tree-select): customized icon feat(module:tree, tree-select): support customize icons Feb 27, 2019
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.

consider my comment and rebase master pls

components/tree/demo/customized-icon.ts Show resolved Hide resolved
@simplejason
Copy link
Member

抽时间考虑一下string支持问题,如果支持要么取消旋转class,要么对用户说明旋转属于设计问题,之后rebase一下master

@danranVm
Copy link
Member Author

danranVm commented Mar 5, 2019

@simplejason 移除了 string 的支持,新增了 show line 时也支持自定义图标。

@danranVm
Copy link
Member Author

@hsuanxyz @simplejason 没其他问题的话,麻烦 merge 一下吧,不然隔段时间就要 rebase

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.

除了提的几个小问题,其他没什么,微调一下可以直接合到下个更新

components/tree/doc/index.en-US.md Outdated Show resolved Hide resolved
components/tree/demo/customized-icon.ts Outdated Show resolved Hide resolved
components/tree/demo/customized-icon.ts Outdated Show resolved Hide resolved
@hsuanxyz hsuanxyz merged commit a77f6c9 into NG-ZORRO:master Apr 15, 2019
andrew-yangy pushed a commit to andrew-yangy/ng-zorro-antd that referenced this pull request Jun 20, 2019
* feat(module:tree and tree-select): customized icon

* feat(module:tree and tree-select): add template context

* feat(module:tree and tree-select): fix lint

* feat(module:tree and tree-select): fix type

* feat(module:tree and tree-select): support customize icons with show line

* feat(module:tree and tree-select): fix test

* feat(module:tree and tree-select): update doc

* feat(module:tree and tree-select): fix quotation

* feat(module:tree and tree-select): fix testing

* feat(module:tree and tree-select): modify dome variable
@danranVm danranVm deleted the feat-tree-customized-icon branch November 25, 2019 16:44
[type]="node.isExpanded ? 'folder-open' : 'folder'"
class="ant-tree-switcher-line-icon"
></i>
<i *ngIf="node.origin.isLeaf" nz-icon type="file" class="ant-tree-switcher-line-icon"></i>
Copy link
Member

Choose a reason for hiding this comment

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

@danranVm @simplejason demo 要改一下,nzExpandedIcon 就是 非叶子节点才有的。。会造成误解

Ricbet pushed a commit to Ricbet/ng-zorro-antd that referenced this pull request Apr 9, 2020
* feat(module:tree and tree-select): customized icon

* feat(module:tree and tree-select): add template context

* feat(module:tree and tree-select): fix lint

* feat(module:tree and tree-select): fix type

* feat(module:tree and tree-select): support customize icons with show line

* feat(module:tree and tree-select): fix test

* feat(module:tree and tree-select): update doc

* feat(module:tree and tree-select): fix quotation

* feat(module:tree and tree-select): fix testing

* feat(module:tree and tree-select): modify dome variable
hsuanxyz pushed a commit to hsuanxyz/ng-zorro-antd that referenced this pull request Aug 5, 2020
* feat(module:tree and tree-select): customized icon

* feat(module:tree and tree-select): add template context

* feat(module:tree and tree-select): fix lint

* feat(module:tree and tree-select): fix type

* feat(module:tree and tree-select): support customize icons with show line

* feat(module:tree and tree-select): fix test

* feat(module:tree and tree-select): update doc

* feat(module:tree and tree-select): fix quotation

* feat(module:tree and tree-select): fix testing

* feat(module:tree and tree-select): modify dome variable
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.

5 participants