From 5bcb23dd27e5cb4be467bd417a126e2d955dca65 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 10 May 2016 11:55:58 +0800
Subject: [PATCH] Fix feedback in form control, close #1619

---
 components/cascader/style/index.less |  1 -
 components/form/demo/mix.md          | 24 +++++++++++++++++++++++-
 components/form/style/index.less     | 12 ++----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less
index f262c0295c..a3b5d7d7b5 100644
--- a/components/cascader/style/index.less
+++ b/components/cascader/style/index.less
@@ -6,7 +6,6 @@
 .@{cascader-prefix-cls} {
   font-size: @font-size-base;
   &-input {
-    width: 172px;
     display: block;
     cursor: pointer;
   }
diff --git a/components/form/demo/mix.md b/components/form/demo/mix.md
index de7b1738ec..728a3d89ca 100644
--- a/components/form/demo/mix.md
+++ b/components/form/demo/mix.md
@@ -7,12 +7,25 @@ title: 表单组合
 
 ````jsx
 import { Form, Select, InputNumber, DatePicker, TimePicker, Switch, Radio,
-         Slider, Button, Col, Upload, Icon } from 'antd';
+         Cascader, Slider, Button, Col, Upload, Icon } from 'antd';
 const FormItem = Form.Item;
 const Option = Select.Option;
 const RadioButton = Radio.Button;
 const RadioGroup = Radio.Group;
 
+const areaData = [{
+  value: 'shanghai',
+  label: '上海',
+  children: [{
+    value: 'shanghaishi',
+    label: '上海市',
+    children: [{
+      value: 'pudongxinqu',
+      label: '浦东新区',
+    }],
+  }],
+}];
+
 let Demo = React.createClass({
   handleSubmit(e) {
     e.preventDefault();
@@ -79,6 +92,15 @@ let Demo = React.createClass({
           </Select>
         </FormItem>
 
+        <FormItem
+          label="级联选择："
+          labelCol={{ span: 8 }}
+          wrapperCol={{ span: 16 }}
+          required
+          hasFeedback>
+          <Cascader style={{ width: 200 }} options={areaData} {...getFieldProps('area')} />
+        </FormItem>
+
         <FormItem
           label="DatePicker 日期选择框："
           labelCol={{ span: 8 }}
diff --git a/components/form/style/index.less b/components/form/style/index.less
index 781ee5c88d..61d6165f90 100644
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -27,11 +27,6 @@ label {
   color: @label-required-color;
 }
 
-//== Input type: with extra icon
-.has-feedback {
-  .input-with-icon();
-}
-
 //== Style for input-group: input with label, with button or dropdown...
 .ant-input-group {
   .input-group(~"ant-input");
@@ -122,10 +117,6 @@ input[type="checkbox"] {
 // 表单下的输入框尺寸唯一: 大尺寸
 form {
   .has-feedback {
-    .@{iconfont-css-prefix} {
-      .square(@input-height-lg);
-      line-height: @input-height-lg;
-    }
     .ant-input {
       padding-right: 24px;
     }
@@ -176,7 +167,8 @@ form {
     margin-right: 8px;
   }
 
-  .ant-select {
+  .ant-select,
+  .ant-cascader-picker {
     width: 100%;
   }
 }