From 2d187d96c47de0b06b41838287358f82d6abaa3f Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 15 Apr 2019 11:25:29 +0800 Subject: [PATCH] [new feature] Feild: add error-message-align prop --- dist/field/index.js | 1 + dist/field/index.wxml | 2 +- dist/field/index.wxss | 2 +- lib/field/index.js | 1 + lib/field/index.wxml | 2 +- lib/field/index.wxss | 2 +- packages/field/README.md | 3 ++- packages/field/index.less | 8 ++++++++ packages/field/index.ts | 1 + packages/field/index.wxml | 2 +- 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dist/field/index.js b/dist/field/index.js index bedaf02c..b465e17e 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -19,6 +19,7 @@ VantComponent({ iconClass: String, clearable: Boolean, inputAlign: String, + errorMessageAlign: String, customClass: String, confirmType: String, confirmHold: Boolean, diff --git a/dist/field/index.wxml b/dist/field/index.wxml index baa5f4df..afaca58d 100644 --- a/dist/field/index.wxml +++ b/dist/field/index.wxml @@ -76,7 +76,7 @@ - + {{ errorMessage }} diff --git a/dist/field/index.wxss b/dist/field/index.wxss index 4853be90..99ac1dcb 100644 --- a/dist/field/index.wxss +++ b/dist/field/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__input--error{color:#f44}.van-field__placeholder{color:#999}.van-field__clear-root{display:-webkit-flex;display:flex;height:24px;-webkit-align-items:center;align-items:center}.van-field__button,.van-field__clear,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__clear{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon{display:block!important}.van-field__button{padding-left:10px}.van-field__error-message{font-size:12px;color:#f44;text-align:left} \ No newline at end of file +@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__input--error{color:#f44}.van-field__placeholder{color:#999}.van-field__clear-root{display:-webkit-flex;display:flex;height:24px;-webkit-align-items:center;align-items:center}.van-field__button,.van-field__clear,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__clear{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon{display:block!important}.van-field__button{padding-left:10px}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error--center{text-align:center}.van-field__error--right{text-align:right} \ No newline at end of file diff --git a/lib/field/index.js b/lib/field/index.js index 1c439e40..155d457b 100644 --- a/lib/field/index.js +++ b/lib/field/index.js @@ -21,6 +21,7 @@ component_1.VantComponent({ iconClass: String, clearable: Boolean, inputAlign: String, + errorMessageAlign: String, customClass: String, confirmType: String, confirmHold: Boolean, diff --git a/lib/field/index.wxml b/lib/field/index.wxml index baa5f4df..afaca58d 100644 --- a/lib/field/index.wxml +++ b/lib/field/index.wxml @@ -76,7 +76,7 @@ - + {{ errorMessage }} diff --git a/lib/field/index.wxss b/lib/field/index.wxss index 4853be90..99ac1dcb 100644 --- a/lib/field/index.wxss +++ b/lib/field/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__input--error{color:#f44}.van-field__placeholder{color:#999}.van-field__clear-root{display:-webkit-flex;display:flex;height:24px;-webkit-align-items:center;align-items:center}.van-field__button,.van-field__clear,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__clear{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon{display:block!important}.van-field__button{padding-left:10px}.van-field__error-message{font-size:12px;color:#f44;text-align:left} \ No newline at end of file +@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__input--error{color:#f44}.van-field__placeholder{color:#999}.van-field__clear-root{display:-webkit-flex;display:flex;height:24px;-webkit-align-items:center;align-items:center}.van-field__button,.van-field__clear,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__clear{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon{display:block!important}.van-field__button{padding-left:10px}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error--center{text-align:center}.van-field__error--right{text-align:right} \ No newline at end of file diff --git a/packages/field/README.md b/packages/field/README.md index 639d492c..18556cb9 100644 --- a/packages/field/README.md +++ b/packages/field/README.md @@ -144,7 +144,7 @@ Page({ ### API | 参数 | 说明 | 类型 | 默认值 | -|-----------|-----------|-----------|-------------|-------------| +|-----------|-----------|-----------|-------------| | name | 在表单内提交时的标识符 | `String` | - | | label | 输入框左侧文本 | `String` | - | | size | 单元格大小，可选值为 `large` | `String` | - | @@ -164,6 +164,7 @@ Page({ | is-link | 是否展示右侧箭头并开启点击反馈 | `Boolean` | `false` | | error | 是否将输入内容标红 | `Boolean` | `false` | | error-message | 底部错误提示文案，为空时不展示 | `String` | `''` | +| error-message-align | 底部错误提示文案对齐方式，可选值为 `center` `right` | `String` | `''` | | input-align | 输入框内容对齐方式，可选值为 `center` `right` | `String` | `left` | | autosize | 自适应内容高度，只对 textarea 有效 | `Boolean` | `false` | | icon | 输入框尾部图标名称或图片链接，可选值见 Icon 组件 | `String` | - | diff --git a/packages/field/index.less b/packages/field/index.less index ef9f3468..4a1b4770 100644 --- a/packages/field/index.less +++ b/packages/field/index.less @@ -88,5 +88,13 @@ font-size: 12px; color: @red; text-align: left; + + &--center { + text-align: center; + } + + &--right { + text-align: right; + } } } diff --git a/packages/field/index.ts b/packages/field/index.ts index 103f05bc..8ec2c6cf 100644 --- a/packages/field/index.ts +++ b/packages/field/index.ts @@ -22,6 +22,7 @@ VantComponent({ iconClass: String, clearable: Boolean, inputAlign: String, + errorMessageAlign: String, customClass: String, confirmType: String, confirmHold: Boolean, diff --git a/packages/field/index.wxml b/packages/field/index.wxml index baa5f4df..afaca58d 100644 --- a/packages/field/index.wxml +++ b/packages/field/index.wxml @@ -76,7 +76,7 @@ - + {{ errorMessage }}