diff --git a/components/badge/style/index.less b/components/badge/style/index.less
index ff91df51011a..b5a984ca6e6a 100644
--- a/components/badge/style/index.less
+++ b/components/badge/style/index.less
@@ -23,7 +23,7 @@
line-height: @badge-height;
white-space: nowrap;
text-align: center;
- background: @highlight-color;
+ background: @badge-count-background;
border-radius: @badge-height / 2;
box-shadow: 0 0 0 1px @shadow-color-inverse;
a,
diff --git a/components/form/demo/dep-debug.md b/components/form/demo/dep-debug.md
index 19371cef2096..ac8a520ebd3d 100644
--- a/components/form/demo/dep-debug.md
+++ b/components/form/demo/dep-debug.md
@@ -3,6 +3,7 @@ order: 99
title:
zh-CN: Dep Debug
en-US: Dep Debug
+debug: true
---
## zh-CN
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index e519266b5930..709a11eef010 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -662,6 +662,7 @@
@badge-font-weight: normal;
@badge-status-size: 6px;
@badge-text-color: @component-background;
+@badge-count-background: @highlight-color;
// Rate
// ---
diff --git a/components/tree/__tests__/__snapshots__/demo.test.js.snap b/components/tree/__tests__/__snapshots__/demo.test.js.snap
index b0df12b8bb38..b8108f641218 100644
--- a/components/tree/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/demo.test.js.snap
@@ -74,7 +74,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
class="ant-tree-indent"
>
+
+
+
+
+
+
+
+
+ parent 2
+
+
+
@@ -2423,7 +2464,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
class="ant-tree-indent"
>
,
+ children: [
+ {
+ title: 'parent 2-0',
+ key: '0-1-0',
+ icon: ,
+ children: [
+ { title: 'leaf', key: '0-1-0-0', icon: },
+ { title: 'leaf', key: '0-1-0-1', icon: },
+ ],
+ },
+ ]
+ },
];
const Demo: React.FC<{}> = () => {
diff --git a/components/tree/style/mixin.less b/components/tree/style/mixin.less
index 42c4f97ba0fb..626218e50c70 100644
--- a/components/tree/style/mixin.less
+++ b/components/tree/style/mixin.less
@@ -218,6 +218,15 @@
position: relative;
height: 100%;
+ &:first-child::after {
+ position: absolute;
+ top: calc(100% - @tree-title-height - 4px);
+ right: @tree-title-height / 2;
+ bottom: -4px;
+ border-right: 1px solid @border-color-base;
+ content: '';
+ }
+
&::before {
position: absolute;
top: calc(100% - 4px);
@@ -227,10 +236,9 @@
content: '';
}
- &-end {
- &::before {
- display: none;
- }
+ &-end::before,
+ &-end-first-level::after {
+ display: none;
}
}
}
@@ -238,6 +246,7 @@
/* Motion should hide line of measure */
.@{custom-tree-node-prefix-cls}-motion:not(.@{tree-motion}-leave):not(.@{tree-motion}-appear-active) {
.@{custom-tree-prefix-cls}-indent-unit {
+ &::after,
&::before {
display: none;
}
diff --git a/package.json b/package.json
index 391d3018cac5..3c28c29679b1 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
"rc-tabs": "~11.6.0",
"rc-textarea": "~0.3.0",
"rc-tooltip": "~4.2.0",
- "rc-tree": "~3.8.5",
+ "rc-tree": "~3.9.0",
"rc-tree-select": "~4.1.1",
"rc-trigger": "~4.4.0",
"rc-upload": "~3.2.0",