diff --git a/components/transfer/__tests__/__snapshots__/demo.test.js.snap b/components/transfer/__tests__/__snapshots__/demo.test.js.snap
index 56462db11c..d6c35e1304 100644
--- a/components/transfer/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/transfer/__tests__/__snapshots__/demo.test.js.snap
@@ -4406,7 +4406,7 @@ exports[`renders ./components/transfer/demo/tree-transfer.md correctly 1`] = `
                       class="ant-tree-indent"
                     >
                       <span
-                        class="ant-tree-indent-unit ant-tree-indent-unit-start"
+                        class="ant-tree-indent-unit"
                       />
                     </span>
                     <span
@@ -4438,7 +4438,7 @@ exports[`renders ./components/transfer/demo/tree-transfer.md correctly 1`] = `
                       class="ant-tree-indent"
                     >
                       <span
-                        class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                        class="ant-tree-indent-unit"
                       />
                     </span>
                     <span
diff --git a/components/tree/__tests__/__snapshots__/demo.test.js.snap b/components/tree/__tests__/__snapshots__/demo.test.js.snap
index cf9f97c56b..cc06d20be6 100644
--- a/components/tree/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/demo.test.js.snap
@@ -78,7 +78,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -131,7 +131,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
@@ -166,10 +166,10 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -201,7 +201,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -254,10 +254,10 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -461,7 +461,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -496,7 +496,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -528,7 +528,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -581,10 +581,10 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start"
+                class="ant-tree-indent-unit"
               />
             </span>
             <span
@@ -616,7 +616,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
                 class="ant-tree-indent-unit"
@@ -651,10 +651,10 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit"
               />
             </span>
             <span
@@ -686,7 +686,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -881,7 +881,7 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -930,7 +930,7 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -1122,7 +1122,7 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -1233,7 +1233,7 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -1282,7 +1282,7 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -1484,7 +1484,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -1514,7 +1514,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -1541,7 +1541,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -1589,7 +1589,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -2025,7 +2025,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                   class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
                 <span
-                  class="ant-tree-indent-unit"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
               </span>
               <span
@@ -2054,12 +2054,17 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
               </span>
               <span
                 class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
+                title=""
               >
                 <span
                   class="ant-tree-title"
                 >
-                  leaf
+                  <div>
+                    multiple line title
+                  </div>
+                  <div>
+                    multiple line title
+                  </div>
                 </span>
               </span>
             </div>
@@ -2074,7 +2079,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                   class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
               </span>
               <span
@@ -2120,7 +2125,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
               </span>
               <span
@@ -2169,7 +2174,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
               </span>
               <span
@@ -2516,7 +2521,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -2562,7 +2567,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
@@ -2611,10 +2616,10 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -2660,10 +2665,10 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -2709,7 +2714,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -2755,7 +2760,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
diff --git a/components/tree/__tests__/__snapshots__/directory.test.js.snap b/components/tree/__tests__/__snapshots__/directory.test.js.snap
index fe3b4cefff..372af6474d 100644
--- a/components/tree/__tests__/__snapshots__/directory.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/directory.test.js.snap
@@ -95,7 +95,7 @@ exports[`Directory Tree DirectoryTree should expend all when use treeData and de
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -165,7 +165,7 @@ exports[`Directory Tree DirectoryTree should expend all when use treeData and de
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
                 class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
@@ -360,7 +360,7 @@ exports[`Directory Tree defaultExpandAll 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -471,7 +471,7 @@ exports[`Directory Tree defaultExpandAll 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -520,7 +520,7 @@ exports[`Directory Tree defaultExpandAll 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -872,7 +872,7 @@ exports[`Directory Tree expand click 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
               </span>
               <span
@@ -1291,7 +1291,7 @@ exports[`Directory Tree expand double click 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start"
                 />
               </span>
               <span
@@ -1661,7 +1661,7 @@ exports[`Directory Tree expand with state control click 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
                 />
               </span>
               <span
@@ -1809,7 +1809,7 @@ exports[`Directory Tree expand with state control doubleClick 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
                 />
               </span>
               <span
@@ -2019,7 +2019,7 @@ exports[`Directory Tree expandedKeys update 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-end"
                 />
               </span>
               <span
@@ -2068,7 +2068,7 @@ exports[`Directory Tree expandedKeys update 1`] = `
                 class="ant-tree-indent"
               >
                 <span
-                  class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                  class="ant-tree-indent-unit ant-tree-indent-unit-end"
                 />
               </span>
               <span
@@ -2261,7 +2261,7 @@ exports[`Directory Tree group select 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -2372,7 +2372,7 @@ exports[`Directory Tree group select 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -2421,7 +2421,7 @@ exports[`Directory Tree group select 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -2613,7 +2613,7 @@ exports[`Directory Tree group select 2`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -2724,7 +2724,7 @@ exports[`Directory Tree group select 2`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -2773,7 +2773,7 @@ exports[`Directory Tree group select 2`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -3027,7 +3027,7 @@ exports[`Directory Tree selectedKeys update 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -3138,7 +3138,7 @@ exports[`Directory Tree selectedKeys update 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -3187,7 +3187,7 @@ exports[`Directory Tree selectedKeys update 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-end"
               />
             </span>
             <span
diff --git a/components/tree/__tests__/__snapshots__/index.test.js.snap b/components/tree/__tests__/__snapshots__/index.test.js.snap
index 5810efa18c..6d787cba90 100644
--- a/components/tree/__tests__/__snapshots__/index.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/index.test.js.snap
@@ -196,7 +196,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -245,7 +245,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
                 class="ant-tree-indent-unit ant-tree-indent-unit-start"
@@ -277,10 +277,10 @@ exports[`Tree showLine is object type should render correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
-                class="ant-tree-indent-unit"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -309,10 +309,10 @@ exports[`Tree showLine is object type should render correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start"
               />
             </span>
             <span
@@ -341,7 +341,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -390,7 +390,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -490,7 +490,7 @@ exports[`Tree switcherIcon in Tree could be string 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -515,7 +515,7 @@ exports[`Tree switcherIcon in Tree could be string 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -591,7 +591,7 @@ exports[`Tree switcherIcon should be loading icon when loadData 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
@@ -640,7 +640,7 @@ exports[`Tree switcherIcon should be loading icon when loadData 1`] = `
               class="ant-tree-indent"
             >
               <span
-                class="ant-tree-indent-unit ant-tree-indent-unit-end ant-tree-indent-unit-end-first-level"
+                class="ant-tree-indent-unit ant-tree-indent-unit-start ant-tree-indent-unit-end"
               />
             </span>
             <span
diff --git a/components/tree/demo/line.md b/components/tree/demo/line.md
index 755dca5192..030c27cfc2 100644
--- a/components/tree/demo/line.md
+++ b/components/tree/demo/line.md
@@ -30,7 +30,16 @@ const treeData = [
         icon: <CarryOutOutlined />,
         children: [
           { title: 'leaf', key: '0-0-0-0', icon: <CarryOutOutlined /> },
-          { title: 'leaf', key: '0-0-0-1', icon: <CarryOutOutlined /> },
+          {
+            title: (
+              <>
+                <div>multiple line title</div>
+                <div>multiple line title</div>
+              </>
+            ),
+            key: '0-0-0-1',
+            icon: <CarryOutOutlined />,
+          },
           { title: 'leaf', key: '0-0-0-2', icon: <CarryOutOutlined /> },
         ],
       },
diff --git a/components/tree/style/mixin.less b/components/tree/style/mixin.less
index 4bf87bb19b..20f85cdc98 100644
--- a/components/tree/style/mixin.less
+++ b/components/tree/style/mixin.less
@@ -4,6 +4,7 @@
 @tree-node-prefix-cls: ~'@{tree-prefix-cls}-treenode';
 @select-tree-prefix-cls: ~'@{ant-prefix}-select-tree';
 @tree-motion: ~'@{ant-prefix}-motion-collapse';
+@tree-node-padding: @padding-xs / 2;
 
 .antTreeSwitcherIcon(@type: 'tree-default-open-icon') {
   .@{tree-prefix-cls}-switcher-icon,
@@ -60,7 +61,7 @@
   .@{custom-tree-node-prefix-cls} {
     display: flex;
     align-items: flex-start;
-    padding: 0 0 (@padding-xs / 2) 0;
+    padding: 0 0 @tree-node-padding 0;
     outline: none;
     // Disabled
     &-disabled {
@@ -95,10 +96,11 @@
   // >>> Switcher
   & &-switcher {
     .antTreeSwitcherIcon();
+    position: relative;
     flex: none;
+    align-self: stretch;
 
     width: @tree-title-height;
-    height: @tree-title-height;
     margin: 0;
     line-height: @tree-title-height;
     text-align: center;
@@ -127,7 +129,8 @@
       height: 100%;
       &::before {
         position: absolute;
-        height: @tree-title-height;
+        top: 0;
+        bottom: -@tree-node-padding;
         margin-left: -1px;
         border-left: 1px solid @normal-color;
         content: ' ';
@@ -217,37 +220,19 @@
         position: relative;
         height: 100%;
 
-        &:first-child::after {
+        &::before {
           position: absolute;
-          top: calc(100% - @tree-title-height - 4px);
+          top: 0;
           right: @tree-title-height / 2;
-          bottom: -4px;
+          bottom: -@tree-node-padding;
           border-right: 1px solid @border-color-base;
           content: '';
         }
 
-        &::before {
-          position: absolute;
-          top: calc(100% - 4px);
-          right: -@tree-title-height / 2;
-          bottom: -@tree-title-height - 4px;
-          border-right: 1px solid @border-color-base;
-          content: '';
-        }
-
-        &-end::before,
-        &-end-first-level::after {
-          display: none;
-        }
-      }
-    }
-
-    /* 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;
+        &-end {
+          &::before {
+            display: none;
+          }
         }
       }
     }
@@ -264,6 +249,8 @@
   .@{tree-prefix-cls}-switcher {
     &-leaf-line {
       &::before {
+        top: auto !important;
+        bottom: auto !important;
         height: @tree-title-height - 10px !important;
       }
     }
diff --git a/package.json b/package.json
index 0cde0d6a4a..5ae33cc494 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "rc-tabs": "~11.7.0",
     "rc-textarea": "~0.3.0",
     "rc-tooltip": "~5.0.0",
-    "rc-tree": "~3.10.0",
+    "rc-tree": "~3.11.0",
     "rc-tree-select": "~4.1.1",
     "rc-trigger": "~5.0.3",
     "rc-upload": "~3.3.1",