diff --git a/src/field/index.js b/src/field/index.js index 86e6a26f2..d052a122e 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -326,18 +326,17 @@ export default createComponent({ genInput() { const { type } = this; const inputSlot = this.slots('input'); + const inputAlign = this.getProp('inputAlign'); if (inputSlot) { return ( -
- {inputSlot} -
+
{inputSlot}
); } const inputProps = { ref: 'input', - class: bem('control', this.inputAlign), + class: bem('control', inputAlign), domProps: { value: this.value, }, @@ -435,11 +434,13 @@ export default createComponent({ }, getProp(key) { + if (isDef(this[key])) { + return this[key]; + } + if (this.vanForm && isDef(this.vanForm[key])) { return this.vanForm[key]; } - - return this[key]; }, }, diff --git a/src/form/README.md b/src/form/README.md index ead064b26..ea9c3cb6a 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -406,6 +406,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| | label-align | Label text align, can be set to `center` `right` | *string* | `left` | +| input-align | Input text align, can be set to `center` `right` | *string* | `left` | | validate-first | Whether to stop the validation when a rule fails | *boolean* | `false` | ### Events diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index 3725106c9..b707cacd0 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -437,7 +437,8 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| -| label-align | 表单项左侧文本对齐方式,可选值为 `center` `right` | *string* | `left` | +| label-align | 表单项文本对齐方式,可选值为 `center` `right` | *string* | `left` | +| input-align | 输入框内容对齐方式,可选值为 `center` `right` | *string* | `left` | | validate-first | 是否在某一项校验不通过时停止校验 | *boolean* | `false` | ### Events diff --git a/src/form/demo/BasicUsage.vue b/src/form/demo/BasicUsage.vue index 1ffb1eff3..ede60f5be 100644 --- a/src/form/demo/BasicUsage.vue +++ b/src/form/demo/BasicUsage.vue @@ -1,6 +1,6 @@