From 715f2f6ebcfe0a62e842bd28d196124f1965cb23 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 7 May 2019 11:13:55 +0800
Subject: [PATCH] :bug: Fix hasFeedback overlap issue with Input.Password

close #16443
---
 components/form/demo/register.md | 6 ++++--
 components/form/style/index.less | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/form/demo/register.md b/components/form/demo/register.md
index d5085fa208..09445c3b3d 100644
--- a/components/form/demo/register.md
+++ b/components/form/demo/register.md
@@ -148,6 +148,7 @@ class RegistrationForm extends React.Component {
         </Form.Item>
         <Form.Item
           label="Password"
+          hasFeedback
         >
           {getFieldDecorator('password', {
             rules: [{
@@ -156,11 +157,12 @@ class RegistrationForm extends React.Component {
               validator: this.validateToNextPassword,
             }],
           })(
-            <Input type="password" />
+            <Input.Password />
           )}
         </Form.Item>
         <Form.Item
           label="Confirm Password"
+          hasFeedback
         >
           {getFieldDecorator('confirm', {
             rules: [{
@@ -169,7 +171,7 @@ class RegistrationForm extends React.Component {
               validator: this.compareToFirstPassword,
             }],
           })(
-            <Input type="password" onBlur={this.handleConfirmBlur} />
+            <Input.Password onBlur={this.handleConfirmBlur} />
           )}
         </Form.Item>
         <Form.Item
diff --git a/components/form/style/index.less b/components/form/style/index.less
index 384222663a..2df14b1e01 100644
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -163,13 +163,16 @@ input[type='checkbox'] {
   text-align: center;
 }
 
-// 表单下的输入框尺寸唯一: 大尺寸
 form {
   .has-feedback {
     .@{ant-prefix}-input {
       padding-right: 24px;
     }
 
+    .@{ant-prefix}-input-password-icon {
+      margin-right: 18px;
+    }
+
     // Fix overlapping between feedback icon and <Select>'s arrow.
     // https://github.com/ant-design/ant-design/issues/4431
     > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,