diff --git a/antdv-demo b/antdv-demo
index 38d737b35..e157a5f47 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit 38d737b353607aaf4d75d4437e01c0daf15bf3d7
+Subproject commit e157a5f47c6972501cbb4f5b15bad81d574977a4
diff --git a/components/tag/__tests__/__snapshots__/demo.test.js.snap b/components/tag/__tests__/__snapshots__/demo.test.js.snap
index bcfb91d3e..db4c9e786 100644
--- a/components/tag/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tag/__tests__/__snapshots__/demo.test.js.snap
@@ -1,92 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders ./antdv-demo/docs/tag/demo/basic.md correctly 1`] = `
-<div><span class="ant-tag">Tag 1</span> <span class="ant-tag"><a href="https://github.com/vueComponent/ant-design">Link</a></span> <span class="ant-tag">
-    Tag 2
-  <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span> <span class="ant-tag">
-    Prevent Default
-  <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></div>
-`;
+exports[`renders ./antdv-demo/docs/tag/demo/basic.md correctly 1`] = `<div><span class="ant-tag">Tag 1<!----></span><span class="ant-tag"><a href="https://github.com/vueComponent/ant-design">Link</a><!----></span><span class="ant-tag"> Tag 2 <span tabindex="-1" role="img" aria-label="close" class="anticon anticon-close"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span><span class="ant-tag"> Prevent Default <span tabindex="-1" role="img" aria-label="close" class="anticon anticon-close"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></div>`;
 
 exports[`renders ./antdv-demo/docs/tag/demo/checkable.md correctly 1`] = `
 <div>
-  <div class="ant-tag ant-tag-checkable">
-    Tag1
-  </div>
-  <div class="ant-tag ant-tag-checkable">
-    Tag2
-  </div>
-  <div class="ant-tag ant-tag-checkable">
-    Tag3
-  </div>
+  <div class="ant-tag ant-tag-checkable"> Tag1 </div>
+  <div class="ant-tag ant-tag-checkable"> Tag2 </div>
+  <div class="ant-tag ant-tag-checkable"> Tag3 </div>
 </div>
 `;
 
 exports[`renders ./antdv-demo/docs/tag/demo/colorful.md correctly 1`] = `
 <div>
-  <h4 style="margin-bottom: 16px;">
-    Presets:
-  </h4>
-  <div><span class="ant-tag ant-tag-pink">
-      pink
-    </span> <span class="ant-tag ant-tag-red">
-      red
-    </span> <span class="ant-tag ant-tag-orange">
-      orange
-    </span> <span class="ant-tag ant-tag-green">
-      green
-    </span> <span class="ant-tag ant-tag-cyan">
-      cyan
-    </span> <span class="ant-tag ant-tag-blue">
-      blue
-    </span> <span class="ant-tag ant-tag-purple">
-      purple
-    </span></div>
-  <h4>
-    Custom:
-  </h4>
-  <div><span class="ant-tag ant-tag-has-color" style="background-color: rgb(255, 85, 0);">
-      #f50
-    </span> <span class="ant-tag ant-tag-has-color" style="background-color: rgb(45, 183, 245);">
-      #2db7f5
-    </span> <span class="ant-tag ant-tag-has-color" style="background-color: rgb(135, 208, 104);">
-      #87d068
-    </span> <span class="ant-tag ant-tag-has-color" style="background-color: rgb(16, 142, 233);">
-      #108ee9
-    </span></div>
+  <h4 style="margin-bottom: 16px;"> Presets: </h4>
+  <div><span class="ant-tag ant-tag-pink"> pink <!----></span><span class="ant-tag ant-tag-red"> red <!----></span><span class="ant-tag ant-tag-orange"> orange <!----></span><span class="ant-tag ant-tag-green"> green <!----></span><span class="ant-tag ant-tag-cyan"> cyan <!----></span><span class="ant-tag ant-tag-blue"> blue <!----></span><span class="ant-tag ant-tag-purple"> purple <!----></span></div>
+  <h4> Custom: </h4>
+  <div><span class="ant-tag ant-tag-has-color" style="background-color: rgb(255, 85, 0);"> #f50 <!----></span><span class="ant-tag ant-tag-has-color" style="background-color: rgb(45, 183, 245);"> #2db7f5 <!----></span><span class="ant-tag ant-tag-has-color" style="background-color: rgb(135, 208, 104);"> #87d068 <!----></span><span class="ant-tag ant-tag-has-color" style="background-color: rgb(16, 142, 233);"> #108ee9 <!----></span></div>
 </div>
 `;
 
 exports[`renders ./antdv-demo/docs/tag/demo/control.md correctly 1`] = `
-<div><span class="ant-tag">
-      Unremovable
-    </span><span class="ant-tag">
-      Tag 2
-    <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span><span class="ant-tag">
-        Tag 3Tag 3Tag 3Tag 3...
-      <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span> <span class="ant-tag" style="border-style: dashed; background: rgb(255, 255, 255);"><span role="img" aria-label="plus" class="anticon anticon-plus"><svg viewBox="64 64 896 896" focusable="false" data-icon="plus" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><defs><style></style></defs><path d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"></path><path d="M176 474h672q8 0 8 8v60q0 8-8 8H176q-8 0-8-8v-60q0-8 8-8z"></path></svg></span> New Tag
-  </span></div>
+<div><span class="ant-tag">Unremovable<!----></span><span class="ant-tag">Tag 2<span tabindex="-1" role="img" aria-label="close" class="anticon anticon-close"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span>
+  <!----><span class="ant-tag">Tag 3Tag 3Tag 3Tag 3...<span tabindex="-1" role="img" aria-label="close" class="anticon anticon-close"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span><span class="ant-tag" style="background: rgb(255, 255, 255); border-style: dashed;"><span role="img" aria-label="plus" class="anticon anticon-plus"><svg class="" data-icon="plus" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><defs><style></style></defs><path d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"></path><path d="M176 474h672q8 0 8 8v60q0 8-8 8H176q-8 0-8-8v-60q0-8 8-8z"></path></svg></span> New Tag
+  <!----></span></div>
 `;
 
 exports[`renders ./antdv-demo/docs/tag/demo/controlled.md correctly 1`] = `
-<div><span class="ant-tag">
-    Movies
-  <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span> <br> <button type="button" class="ant-btn ant-btn-sm"><span>Toggle</span></button></div>
+<div><span class="ant-tag"> Movies <span tabindex="-1" role="img" aria-label="close" class="anticon anticon-close"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span><br><button class="ant-btn ant-btn-sm" type="button">
+    <!----><span>Toggle</span></button></div>
 `;
 
 exports[`renders ./antdv-demo/docs/tag/demo/hot-tags.md correctly 1`] = `
 <div><span>Categories:</span>
-  <div class="ant-tag ant-tag-checkable">
-    Movies
-  </div>
-  <div class="ant-tag ant-tag-checkable">
-    Books
-  </div>
-  <div class="ant-tag ant-tag-checkable">
-    Music
-  </div>
-  <div class="ant-tag ant-tag-checkable">
-    Sports
-  </div>
+  <div class="ant-tag ant-tag-checkable">Movies</div>
+  <div class="ant-tag ant-tag-checkable">Books</div>
+  <div class="ant-tag ant-tag-checkable">Music</div>
+  <div class="ant-tag ant-tag-checkable">Sports</div>
 </div>
 `;