diff --git a/components/input/style/index.less b/components/input/style/index.less
index 943099020..120e52dc5 100644
--- a/components/input/style/index.less
+++ b/components/input/style/index.less
@@ -50,6 +50,13 @@
   visibility: hidden;
 }
 
+.@{ant-prefix}-input-affix-wrapper-textarea-with-clear-btn {
+  padding: 0 !important;
+  .@{ant-prefix}-input {
+    padding: @input-padding-vertical-base @input-padding-horizontal-base;
+  }
+}
+
 .@{ant-prefix}-input-textarea-clear-icon {
   .clear-icon();
   position: absolute;
diff --git a/v2-doc b/v2-doc
index 31dce5d5c..f8c276329 160000
--- a/v2-doc
+++ b/v2-doc
@@ -1 +1 @@
-Subproject commit 31dce5d5c125dc5aa8ea9e7e6dff01ef3fbcae9a
+Subproject commit f8c276329a6bfa295847dc4a11538863f9f4cced