diff --git a/src/components/form/form-item.vue b/src/components/form/form-item.vue index 1ca3911..898b92a 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 9652a83..a9cc194 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 66a906d..0883be3 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 496faa5..7866643 100644 --- a/test/routers/button.vue +++ b/test/routers/button.vue @@ -1,6 +1,19 @@