From b7cda2184527e812b3d9623cd26f8eca8b25b40c Mon Sep 17 00:00:00 2001
From: zoomdong <1344492820@qq.com>
Date: Sun, 28 Jun 2020 21:36:47 +0800
Subject: [PATCH] resolve confilct

---
 .../__snapshots__/components.test.js.snap     | 36 ++++++------
 .../__snapshots__/index.test.js.snap          |  8 +--
 .../__tests__/__snapshots__/demo.test.js.snap | 51 ++++++++++-------
 .../__tests__/__snapshots__/demo.test.js.snap |  4 +-
 .../__snapshots__/index.test.js.snap          |  2 +-
 .../__tests__/__snapshots__/demo.test.js.snap | 48 ++++++++--------
 .../__snapshots__/directory.test.js.snap      | 56 +++++++++----------
 .../__snapshots__/index.test.js.snap          | 16 +++---
 8 files changed, 115 insertions(+), 106 deletions(-)

diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
index a3645022df..12e3c8f43a 100644
--- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap
+++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
@@ -36299,7 +36299,7 @@ exports[`ConfigProvider components Tree configProvider 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
+            class="config-tree-treenode config-tree-treenode-switcher-close"
           >
             <span
               class="config-tree-switcher config-tree-switcher-noop"
@@ -36340,7 +36340,7 @@ exports[`ConfigProvider components Tree configProvider 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
+            class="config-tree-treenode config-tree-treenode-switcher-close"
           >
             <span
               class="config-tree-switcher config-tree-switcher-noop"
@@ -36410,7 +36410,7 @@ exports[`ConfigProvider components Tree configProvider componentSize large 1`] =
           style="display:flex;flex-direction:column"
         >
           <div
-            class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
+            class="config-tree-treenode config-tree-treenode-switcher-close"
           >
             <span
               class="config-tree-switcher config-tree-switcher-noop"
@@ -36451,7 +36451,7 @@ exports[`ConfigProvider components Tree configProvider componentSize large 1`] =
           style="display:flex;flex-direction:column"
         >
           <div
-            class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
+            class="config-tree-treenode config-tree-treenode-switcher-close"
           >
             <span
               class="config-tree-switcher config-tree-switcher-noop"
@@ -36521,7 +36521,7 @@ exports[`ConfigProvider components Tree configProvider componentSize middle 1`]
           style="display:flex;flex-direction:column"
         >
           <div
-            class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
+            class="config-tree-treenode config-tree-treenode-switcher-close"
           >
             <span
               class="config-tree-switcher config-tree-switcher-noop"
@@ -36562,7 +36562,7 @@ exports[`ConfigProvider components Tree configProvider componentSize middle 1`]
           style="display:flex;flex-direction:column"
         >
           <div
-            class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
+            class="config-tree-treenode config-tree-treenode-switcher-close"
           >
             <span
               class="config-tree-switcher config-tree-switcher-noop"
@@ -36632,7 +36632,7 @@ exports[`ConfigProvider components Tree configProvider virtual and dropdownMatch
           style="display:flex;flex-direction:column"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               class="ant-tree-switcher ant-tree-switcher-noop"
@@ -36673,7 +36673,7 @@ exports[`ConfigProvider components Tree configProvider virtual and dropdownMatch
           style="display:flex;flex-direction:column"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               class="ant-tree-switcher ant-tree-switcher-noop"
@@ -36743,7 +36743,7 @@ exports[`ConfigProvider components Tree normal 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               class="ant-tree-switcher ant-tree-switcher-noop"
@@ -36784,7 +36784,7 @@ exports[`ConfigProvider components Tree normal 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               class="ant-tree-switcher ant-tree-switcher-noop"
@@ -36854,7 +36854,7 @@ exports[`ConfigProvider components Tree prefixCls 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close prefix-Tree-treenode-leaf-last"
+            class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close"
           >
             <span
               class="prefix-Tree-switcher prefix-Tree-switcher-noop"
@@ -36895,7 +36895,7 @@ exports[`ConfigProvider components Tree prefixCls 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close prefix-Tree-treenode-leaf-last"
+            class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close"
           >
             <span
               class="prefix-Tree-switcher prefix-Tree-switcher-noop"
@@ -37001,7 +37001,7 @@ exports[`ConfigProvider components TreeSelect configProvider 1`] = `
                   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"
                   >
                     <span
                       class="config-select-tree-switcher config-select-tree-switcher-noop"
@@ -37114,7 +37114,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize large
                   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"
                   >
                     <span
                       class="config-select-tree-switcher config-select-tree-switcher-noop"
@@ -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"
                   >
                     <span
                       class="config-select-tree-switcher config-select-tree-switcher-noop"
@@ -37340,7 +37340,7 @@ exports[`ConfigProvider components TreeSelect configProvider virtual and dropdow
                   style="display:flex;flex-direction:column"
                 >
                   <div
-                    class="ant-select-tree-treenode ant-select-tree-treenode-switcher-close ant-select-tree-treenode-leaf-last"
+                    class="ant-select-tree-treenode ant-select-tree-treenode-switcher-close"
                   >
                     <span
                       class="ant-select-tree-switcher ant-select-tree-switcher-noop"
@@ -37453,7 +37453,7 @@ exports[`ConfigProvider components TreeSelect normal 1`] = `
                   style="display:flex;flex-direction:column"
                 >
                   <div
-                    class="ant-select-tree-treenode ant-select-tree-treenode-switcher-close ant-select-tree-treenode-leaf-last"
+                    class="ant-select-tree-treenode ant-select-tree-treenode-switcher-close"
                   >
                     <span
                       class="ant-select-tree-switcher ant-select-tree-switcher-noop"
@@ -37566,7 +37566,7 @@ exports[`ConfigProvider components TreeSelect prefixCls 1`] = `
                   style="display:flex;flex-direction:column"
                 >
                   <div
-                    class="prefix-TreeSelect-tree-treenode prefix-TreeSelect-tree-treenode-switcher-close prefix-TreeSelect-tree-treenode-leaf-last"
+                    class="prefix-TreeSelect-tree-treenode prefix-TreeSelect-tree-treenode-switcher-close"
                   >
                     <span
                       class="prefix-TreeSelect-tree-switcher prefix-TreeSelect-tree-switcher-noop"
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
index 45615523bb..ae1eb60d8e 100644
--- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
+++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
@@ -253742,7 +253742,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
                   tabindex="-1"
                   type="button"
                 >
-                  Th09
+                  Thg 09
                 </button>
                 <button
                   class="ant-picker-year-btn"
@@ -255799,7 +255799,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
                       tabindex="-1"
                       type="button"
                     >
-                      Th09
+                      Thg 09
                     </button>
                     <button
                       class="ant-picker-year-btn"
@@ -256337,7 +256337,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
                       tabindex="-1"
                       type="button"
                     >
-                      Th10
+                      Thg 10
                     </button>
                     <button
                       class="ant-picker-year-btn"
@@ -257358,7 +257358,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
           <span
             class="ant-select-selection-item"
           >
-            Th09
+            Thg 09
           </span>
         </div>
         <span
diff --git a/components/tabs/__tests__/__snapshots__/demo.test.js.snap b/components/tabs/__tests__/__snapshots__/demo.test.js.snap
index 9303e0cfdc..9011eb2e0d 100644
--- a/components/tabs/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tabs/__tests__/__snapshots__/demo.test.js.snap
@@ -405,33 +405,42 @@ exports[`renders ./components/tabs/demo/centered.md correctly 1`] = `
         class="ant-tabs-nav-list"
         style="transform:translate(0px, 0px)"
       >
-        <button
-          aria-selected="true"
+        <div
           class="ant-tabs-tab ant-tabs-tab-active"
-          role="tab"
-          tabindex="0"
-          type="button"
         >
-          Tab 1
-        </button>
-        <button
-          aria-selected="false"
+          <div
+            aria-selected="true"
+            class="ant-tabs-tab-btn"
+            role="tab"
+            tabindex="0"
+          >
+            Tab 1
+          </div>
+        </div>
+        <div
           class="ant-tabs-tab"
-          role="tab"
-          tabindex="0"
-          type="button"
         >
-          Tab 2
-        </button>
-        <button
-          aria-selected="false"
+          <div
+            aria-selected="false"
+            class="ant-tabs-tab-btn"
+            role="tab"
+            tabindex="0"
+          >
+            Tab 2
+          </div>
+        </div>
+        <div
           class="ant-tabs-tab"
-          role="tab"
-          tabindex="0"
-          type="button"
         >
-          Tab 3
-        </button>
+          <div
+            aria-selected="false"
+            class="ant-tabs-tab-btn"
+            role="tab"
+            tabindex="0"
+          >
+            Tab 3
+          </div>
+        </div>
         <div
           class="ant-tabs-ink-bar ant-tabs-ink-bar-animated"
         />
diff --git a/components/transfer/__tests__/__snapshots__/demo.test.js.snap b/components/transfer/__tests__/__snapshots__/demo.test.js.snap
index a0936a244d..46fe15dd92 100644
--- a/components/transfer/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/transfer/__tests__/__snapshots__/demo.test.js.snap
@@ -4446,7 +4446,7 @@ exports[`renders ./components/transfer/demo/tree-transfer.md correctly 1`] = `
                     </span>
                   </div>
                   <div
-                    class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+                    class="ant-tree-treenode ant-tree-treenode-switcher-open"
                   >
                     <span
                       aria-hidden="true"
@@ -4478,7 +4478,7 @@ exports[`renders ./components/transfer/demo/tree-transfer.md correctly 1`] = `
                     </span>
                   </div>
                   <div
-                    class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+                    class="ant-tree-treenode ant-tree-treenode-switcher-open"
                   >
                     <span
                       class="ant-tree-switcher ant-tree-switcher-noop"
diff --git a/components/tree-select/__tests__/__snapshots__/index.test.js.snap b/components/tree-select/__tests__/__snapshots__/index.test.js.snap
index abc20be174..3570f51ff0 100644
--- a/components/tree-select/__tests__/__snapshots__/index.test.js.snap
+++ b/components/tree-select/__tests__/__snapshots__/index.test.js.snap
@@ -60,7 +60,7 @@ exports[`TreeSelect TreeSelect Custom Icons should \`treeIcon\` work 1`] = `
                   style="display: flex; flex-direction: column;"
                 >
                   <div
-                    class="ant-select-tree-treenode ant-select-tree-treenode-switcher-close ant-select-tree-treenode-leaf-last"
+                    class="ant-select-tree-treenode ant-select-tree-treenode-switcher-close"
                   >
                     <span
                       class="ant-select-tree-switcher ant-select-tree-switcher-noop"
diff --git a/components/tree/__tests__/__snapshots__/demo.test.js.snap b/components/tree/__tests__/__snapshots__/demo.test.js.snap
index b0df12b8bb..54b7160771 100644
--- a/components/tree/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/demo.test.js.snap
@@ -22,7 +22,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
         style="display:flex;flex-direction:column"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -155,7 +155,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -190,7 +190,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
         >
           <span
             aria-hidden="true"
@@ -243,7 +243,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-checkbox-checked"
         >
           <span
             aria-hidden="true"
@@ -477,7 +477,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-checkbox-checked"
         >
           <span
             aria-hidden="true"
@@ -635,7 +635,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -670,7 +670,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -747,7 +747,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher-noop"
@@ -798,7 +798,7 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
         style="display:flex;flex-direction:column"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -909,7 +909,7 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -1096,7 +1096,7 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode"
         >
           <span
             aria-hidden="true"
@@ -1145,7 +1145,7 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -1256,7 +1256,7 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode"
         >
           <span
             aria-hidden="true"
@@ -1480,7 +1480,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -1558,7 +1558,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -1625,7 +1625,7 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher-noop"
@@ -1747,7 +1747,7 @@ exports[`renders ./components/tree/demo/dynamic.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher-noop"
@@ -1842,7 +1842,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
           style="display:flex;flex-direction:column"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-open"
           >
             <span
               class="ant-tree-switcher ant-tree-switcher_open"
@@ -2030,7 +2030,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
             </span>
           </div>
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -2128,7 +2128,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
             </span>
           </div>
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -2328,7 +2328,7 @@ exports[`renders ./components/tree/demo/search.md correctly 1`] = `
             </span>
           </div>
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               class="ant-tree-switcher ant-tree-switcher-noop"
@@ -2378,7 +2378,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
         style="display:flex;flex-direction:column"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -2560,7 +2560,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -2655,7 +2655,7 @@ exports[`renders ./components/tree/demo/switcher-icon.md correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
diff --git a/components/tree/__tests__/__snapshots__/directory.test.js.snap b/components/tree/__tests__/__snapshots__/directory.test.js.snap
index df58e8c8ed..bfe71263b1 100644
--- a/components/tree/__tests__/__snapshots__/directory.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/directory.test.js.snap
@@ -22,7 +22,7 @@ exports[`Directory Tree DirectoryTree should expend all when use treeData and de
         style="display:flex;flex-direction:column"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -84,7 +84,7 @@ exports[`Directory Tree DirectoryTree should expend all when use treeData and de
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -154,7 +154,7 @@ exports[`Directory Tree DirectoryTree should expend all when use treeData and de
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode"
         >
           <span
             aria-hidden="true"
@@ -344,7 +344,7 @@ exports[`Directory Tree defaultExpandAll 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -393,7 +393,7 @@ exports[`Directory Tree defaultExpandAll 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -504,7 +504,7 @@ exports[`Directory Tree defaultExpandAll 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -642,7 +642,7 @@ exports[`Directory Tree defaultExpandParent 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -846,7 +846,7 @@ exports[`Directory Tree expand click 1`] = `
             </span>
           </div>
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -896,7 +896,7 @@ exports[`Directory Tree expand click 1`] = `
           </div>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -1048,7 +1048,7 @@ exports[`Directory Tree expand click 2`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -1252,7 +1252,7 @@ exports[`Directory Tree expand double click 1`] = `
             </span>
           </div>
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -1302,7 +1302,7 @@ exports[`Directory Tree expand double click 1`] = `
           </div>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -1454,7 +1454,7 @@ exports[`Directory Tree expand double click 2`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -1544,7 +1544,7 @@ exports[`Directory Tree expand with state control click 1`] = `
         style="display: flex; flex-direction: column;"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-selected ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-selected"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -1609,7 +1609,7 @@ exports[`Directory Tree expand with state control click 1`] = `
           class="ant-tree-treenode-motion"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -1687,7 +1687,7 @@ exports[`Directory Tree expand with state control doubleClick 1`] = `
         style="display: flex; flex-direction: column;"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -1752,7 +1752,7 @@ exports[`Directory Tree expand with state control doubleClick 1`] = `
           class="ant-tree-treenode-motion"
         >
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -1892,7 +1892,7 @@ exports[`Directory Tree expandedKeys update 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -2006,7 +2006,7 @@ exports[`Directory Tree expandedKeys update 1`] = `
             </span>
           </div>
           <div
-            class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+            class="ant-tree-treenode ant-tree-treenode-switcher-close"
           >
             <span
               aria-hidden="true"
@@ -2194,7 +2194,7 @@ exports[`Directory Tree group select 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -2243,7 +2243,7 @@ exports[`Directory Tree group select 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -2354,7 +2354,7 @@ exports[`Directory Tree group select 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -2541,7 +2541,7 @@ exports[`Directory Tree group select 2`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-selected ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-selected"
         >
           <span
             aria-hidden="true"
@@ -2590,7 +2590,7 @@ exports[`Directory Tree group select 2`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-selected ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-selected"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -2701,7 +2701,7 @@ exports[`Directory Tree group select 2`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -2940,7 +2940,7 @@ exports[`Directory Tree selectedKeys update 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -2989,7 +2989,7 @@ exports[`Directory Tree selectedKeys update 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -3100,7 +3100,7 @@ exports[`Directory Tree selectedKeys update 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
diff --git a/components/tree/__tests__/__snapshots__/index.test.js.snap b/components/tree/__tests__/__snapshots__/index.test.js.snap
index 2b93558cc6..6306f74074 100644
--- a/components/tree/__tests__/__snapshots__/index.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/index.test.js.snap
@@ -68,7 +68,7 @@ exports[`Tree icon and switcherIcon of Tree with showLine should render correctl
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -139,7 +139,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
         style="display: flex; flex-direction: column;"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -293,7 +293,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -374,7 +374,7 @@ exports[`Tree showLine is object type should render correctly 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             aria-hidden="true"
@@ -450,7 +450,7 @@ exports[`Tree switcherIcon in Tree could be string 1`] = `
         style="display: flex; flex-direction: column;"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -494,7 +494,7 @@ exports[`Tree switcherIcon in Tree could be string 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             aria-hidden="true"
@@ -546,7 +546,7 @@ exports[`Tree switcherIcon should be loading icon when loadData 1`] = `
         style="display: flex; flex-direction: column;"
       >
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -614,7 +614,7 @@ exports[`Tree switcherIcon should be loading icon when loadData 1`] = `
           </span>
         </div>
         <div
-          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-loading ant-tree-treenode-leaf-last"
+          class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-loading"
         >
           <span
             aria-hidden="true"