From 8a83e7c42b961eced21421bb95c1351b9a03e6fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 5 Jan 2017 18:09:37 +0800
Subject: [PATCH] update Form

update Form
---
 src/components/form/form-item.vue |  2 +-
 src/styles/components/input.less  |  1 +
 src/styles/mixins/input.less      |  1 +
 test/routers/button.vue           | 62 ++++++++++++++++++++-----------
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/components/form/form-item.vue b/src/components/form/form-item.vue
index 1ca39116..898b92ab 100644
--- a/src/components/form/form-item.vue
+++ b/src/components/form/form-item.vue
@@ -57,7 +57,7 @@
                 type: [Object, Array]
             },
             error: {
-                type: Boolean
+                type: String
             },
             validateStatus: {
                 type: Boolean
diff --git a/src/styles/components/input.less b/src/styles/components/input.less
index 9652a836..a9cc1943 100644
--- a/src/styles/components/input.less
+++ b/src/styles/components/input.less
@@ -6,6 +6,7 @@
         display: inline-block;
         width: 100%;
         position: relative;
+        vertical-align: middle;
     }
     &-icon {
         width: 32px;
diff --git a/src/styles/mixins/input.less b/src/styles/mixins/input.less
index 66a906d3..0883be30 100644
--- a/src/styles/mixins/input.less
+++ b/src/styles/mixins/input.less
@@ -102,6 +102,7 @@
     border-collapse: separate;
     position: relative;
     font-size: @font-size-small;
+    top: 1px; // fixed when using in form inline,
 
     &-large{
         font-size: @font-size-base;
diff --git a/test/routers/button.vue b/test/routers/button.vue
index 496faa5a..7866643a 100644
--- a/test/routers/button.vue
+++ b/test/routers/button.vue
@@ -1,6 +1,19 @@
 <template>
     <h4>基本</h4>
     <br><br>
+    <div style="background: #f60">
+        <input-number></input-number>
+        <Date-picker type="date" placeholder="选择日期" style="width: 100px;display: inline-block"></Date-picker>
+        <i-input style="width: 100px"></i-input>
+        <i-input type="text" placeholder="Username" style="width: 100px">
+            <Icon type="ios-person-outline" slot="prepend"></Icon>
+        </i-input>
+        <i-button type="primary">按钮</i-button>
+        <i-select :model.sync="model1" style="width:200px">
+            <i-option v-for="item in cityList" :value="item.value">{{ item.label }}</i-option>
+        </i-select>
+    </div>
+    <br><br>
     <i-button type="success">按钮</i-button>
     <i-button type="warning">按钮</i-button>
     <i-button type="error">按钮</i-button>
@@ -244,27 +257,7 @@
     </Button-group>
 </template>
 <script>
-    import { iButton, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page } from 'iview';
-    const ButtonGroup = iButton.Group;
-    const RadioGroup = Radio.Group;
-    const CheckboxGroup = Checkbox.Group;
-
     export default {
-        components: {
-            iButton,
-            ButtonGroup,
-            Icon,
-            iInput: Input,
-            Switch,
-            Radio,
-            RadioGroup,
-            Checkbox,
-            CheckboxGroup,
-            InputNumber,
-            Row,
-            iCol: Col,
-            Page
-        },
         props: {
 
         },
@@ -272,7 +265,34 @@
             return {
                 loading: false,
                 loading2: false,
-                model6: ''
+                model6: '',
+                cityList: [
+                    {
+                        value: 'beijing',
+                        label: '北京市'
+                    },
+                    {
+                        value: 'shanghai',
+                        label: '上海市'
+                    },
+                    {
+                        value: 'shenzhen',
+                        label: '深圳市'
+                    },
+                    {
+                        value: 'hangzhou',
+                        label: '杭州市'
+                    },
+                    {
+                        value: 'nanjing',
+                        label: '南京市'
+                    },
+                    {
+                        value: 'chongqing',
+                        label: '重庆市'
+                    }
+                ],
+                model1: ''
             }
         },
         methods: {