feat: expand prop showLeafIcon for showLine in Tree Component #25067

fireairforce · 2020-06-17T16:56:00Z

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language	Changelog
🇺🇸 English	Add showLeafIcon for Tree Component when set showLine prop.
🇨🇳 Chinese	Tree `showLine` 属性支持配置隐藏叶节点图标。

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

Doc is updated/provided or not needed
Demo is updated/provided or not needed
TypeScript definition is updated/provided or not needed
Changelog is provided or not needed

View rendered components/tree/demo/switcher-icon.md

ant-design-bot · 2020-06-17T16:59:20Z

ant-design-bot · 2020-06-17T16:59:20Z

fireairforce · 2020-06-19T03:03:43Z

rc那边的pr：react-component/tree#344

fireairforce · 2020-06-19T07:19:07Z

这边调整了传过去的type，应该不需要rc那边的pr了。

components/tree/style/mixin.less

components/tree/demo/switcher-icon.md

components/tree/utils/iconUtil.tsx

xrkffgg · 2020-06-19T07:31:55Z

居中好一点吧

afc163 · 2020-06-19T07:39:13Z

UI 效果应该和 https://codesandbox.io/s/heuristic-leavitt-vhhb0?file=/index.js 一样。

codesandbox-ci · 2020-06-19T07:52:47Z

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit d211d8a:

Sandbox	Source
antd reproduction template	Configuration
blissful-water-s07d2	Issue #23261
bitter-glade-mm4s0	Issue #23261
serverless-star-3q5rm	Issue #23261

codecov · 2020-06-19T07:52:51Z

Codecov Report

Merging #25067 into feature will increase coverage by 0.67%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           feature   #25067      +/-   ##
===========================================
+ Coverage    98.81%   99.49%   +0.67%     
===========================================
  Files          363      368       +5     
  Lines         7280     7283       +3     
  Branches      1967     2031      +64     
===========================================
+ Hits          7194     7246      +52     
+ Misses          86       37      -49

Impacted Files	Coverage Δ
components/_util/easings.ts	`100.00% <ø> (ø)`
components/affix/index.tsx	`99.13% <ø> (ø)`
components/back-top/index.tsx	`100.00% <ø> (ø)`
components/checkbox/Checkbox.tsx	`100.00% <ø> (ø)`
components/config-provider/context.tsx	`100.00% <ø> (ø)`
...date-picker/generatePicker/generateRangePicker.tsx	`100.00% <ø> (ø)`
components/date-picker/locale/tr_TR.tsx	`100.00% <ø> (ø)`
components/descriptions/Cell.tsx	`100.00% <ø> (ø)`
components/form/FormItemInput.tsx	`94.11% <ø> (ø)`
components/form/index.tsx	`100.00% <ø> (ø)`
... and 113 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 c394c8d...d211d8a. Read the comment docs.

afc163 · 2020-06-22T08:35:51Z

这个 demo 加个 Switch 看效果：https://preview-25067-ant-design.surge.sh/components/tree-cn/#components-tree-demo-line

fireairforce · 2020-06-22T09:23:41Z

这个 demo 加个 Switch 看效果：https://preview-25067-ant-design.surge.sh/components/tree-cn/#components-tree-demo-line

done~

afc163 · 2020-06-22T10:05:09Z

反了吧。

最后一个节点的线不应该向下延伸了。

components/tree/Tree.tsx

fireairforce · 2020-06-22T10:20:09Z

反了吧。

最后一个节点的线不应该向下延伸了。

2这里只有最内部的节点能控制样式，所以这里的样式只能写成 |-这样的样式，这里单独控制不了最底下的那个点

afc163 · 2020-06-22T10:25:44Z

可以按需给 rc-tree 增加你要的东西。

fireairforce · 2020-06-22T10:26:10Z

可以按需给 rc-tree 增加你要的东西。

好的，我尝试一下~

fireairforce · 2020-06-28T13:38:24Z

ok，已经同步过来了。

afc163 · 2020-06-28T13:49:25Z

/rebase

afc163 · 2020-06-28T13:49:47Z

components/config-provider/__tests__/__snapshots__/components.test.js.snap

@@ -37227,7 +37227,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize middl
                  style="display:flex;flex-direction:column"
                >
                  <div
-                    class="config-select-tree-treenode config-select-tree-treenode-switcher-close config-select-tree-treenode-leaf-last"
+                    class="config-select-tree-treenode config-select-tree-treenode-switcher-close"


不应该删这个。

应该是跑snapshot更新的，是我这条分支上的rc-tree-select 没有更新到对应到版本。

已经更新了～

afc163 · 2020-06-28T14:17:13Z

snapshot 没改全。

afc163 · 2020-06-28T14:20:26Z

npm test -- -u

fireairforce · 2020-06-28T14:20:44Z

嗯，正在更新

fireairforce · 2020-06-28T15:47:04Z

ci都过了~

fireairforce · 2020-06-28T16:42:48Z

抱歉，我merge的时候好像没有squash,导致commit信息没有正确显示，请问能撤销一下吗quq，抱歉第一次merge。。。
@afc163

yoyo837 · 2020-06-28T23:24:40Z

没有squash是多条，squash后是一条，不反着用错就行

fireairforce · 2020-06-29T01:42:12Z

抱歉~之后看了commit记录才意识到可能是merge的时候没处理好。

afc163 · 2020-06-29T02:30:20Z

不撤销了，下次小心，除了大分支之间走普通 merge，其他都走 squash merge。

fireairforce · 2020-06-29T02:34:33Z

好的，抱歉抱歉，我的失误QuQ

xrkffgg · 2020-06-29T02:54:32Z

现在 feature 比 master 只多了这一个 PR 的 commit ，要不现在把 feature squash 到 master ，这样 master 的 commmit 信息是正常的。

afc163 · 2020-06-29T03:05:36Z

#25271 成功了。

fireairforce · 2020-06-29T03:46:39Z

吸取教训了😭😭😭

fireairforce requested a review from zombieJ as a code owner June 17, 2020 16:56

pr-triage bot added the PR: unreviewed label Jun 17, 2020

This comment has been minimized.

Sign in to view

fireairforce force-pushed the TreeLine branch from d7ff747 to e7e8fc1 Compare June 19, 2020 07:17

afc163 reviewed Jun 19, 2020

View reviewed changes

components/tree/style/mixin.less Outdated Show resolved Hide resolved

afc163 reviewed Jun 19, 2020

View reviewed changes

components/tree/demo/switcher-icon.md Outdated Show resolved Hide resolved

afc163 reviewed Jun 19, 2020

View reviewed changes

components/tree/utils/iconUtil.tsx Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

fireairforce force-pushed the TreeLine branch from f5f9372 to c92f1d4 Compare June 20, 2020 06:59

This comment has been minimized.

Sign in to view

fireairforce force-pushed the TreeLine branch from c92f1d4 to 860e447 Compare June 22, 2020 06:45

afc163 reviewed Jun 22, 2020

View reviewed changes

components/tree/Tree.tsx Outdated Show resolved Hide resolved

fireairforce force-pushed the TreeLine branch from 2de6a47 to 32cc9a5 Compare June 23, 2020 15:32

This comment has been minimized.

Sign in to view

fireairforce added 3 commits June 28, 2020 21:35

update snapshot

9faaf64

adjust css

cfc0804

resolve confilct

b7cda21

fireairforce force-pushed the TreeLine branch from d46b858 to b7cda21 Compare June 28, 2020 13:37

afc163 reviewed Jun 28, 2020

View reviewed changes

update rc-tree-select

c47712f

update

d211d8a

afc163 approved these changes Jun 28, 2020

View reviewed changes

pr-triage bot added PR: partially-approved and removed PR: unreviewed labels Jun 28, 2020

fireairforce merged commit a5a157e into ant-design:feature Jun 28, 2020

pr-triage bot added PR: merged and removed PR: partially-approved labels Jun 28, 2020

fireairforce mentioned this pull request Jun 29, 2020

Tree component - hide file icon when use showLine #23261

Closed

1 task

fireairforce deleted the TreeLine branch June 29, 2020 03:46

OwenPattison mentioned this pull request Jul 26, 2021

Implement the showLeafIcon prop on Tree component vueComponent/ant-design-vue#4421

Closed

1 task

feat: expand prop showLeafIcon for showLine in Tree Component #25067

feat: expand prop showLeafIcon for showLine in Tree Component #25067

Conversation

fireairforce commented Jun 17, 2020 • edited

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self Check before Merge

ant-design-bot commented Jun 17, 2020 • edited

ant-design-bot commented Jun 17, 2020 • edited

This comment has been minimized.

This comment has been minimized.

fireairforce commented Jun 19, 2020 • edited

fireairforce commented Jun 19, 2020 • edited

xrkffgg commented Jun 19, 2020

afc163 commented Jun 19, 2020

codesandbox-ci bot commented Jun 19, 2020 • edited

codecov bot commented Jun 19, 2020 • edited

Codecov Report

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

afc163 commented Jun 22, 2020

fireairforce commented Jun 22, 2020

afc163 commented Jun 22, 2020 • edited by fireairforce

fireairforce commented Jun 22, 2020

afc163 commented Jun 22, 2020

fireairforce commented Jun 22, 2020

This comment has been minimized.

fireairforce commented Jun 28, 2020

afc163 commented Jun 28, 2020

afc163 Jun 28, 2020

Choose a reason for hiding this comment

fireairforce Jun 28, 2020

Choose a reason for hiding this comment

fireairforce Jun 28, 2020

Choose a reason for hiding this comment

afc163 commented Jun 28, 2020

afc163 commented Jun 28, 2020

fireairforce commented Jun 28, 2020

fireairforce commented Jun 28, 2020

fireairforce commented Jun 28, 2020

yoyo837 commented Jun 28, 2020

fireairforce commented Jun 29, 2020

afc163 commented Jun 29, 2020

fireairforce commented Jun 29, 2020

xrkffgg commented Jun 29, 2020

afc163 commented Jun 29, 2020

fireairforce commented Jun 29, 2020

fireairforce commented Jun 17, 2020 •

edited

ant-design-bot commented Jun 17, 2020 •

edited

ant-design-bot commented Jun 17, 2020 •

edited

fireairforce commented Jun 19, 2020 •

edited

fireairforce commented Jun 19, 2020 •

edited

codesandbox-ci bot commented Jun 19, 2020 •

edited

codecov bot commented Jun 19, 2020 •

edited

afc163 commented Jun 22, 2020 •

edited by fireairforce