From 5d24a57feea76803601a1c121079055c2f78dd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 13 Feb 2020 16:49:30 +0800 Subject: [PATCH] feat(Form): input-align works for input slot --- src/calendar/test/__snapshots__/index.spec.js.snap | 10 +++++----- src/field/README.md | 4 ++-- src/field/README.zh-CN.md | 2 +- src/field/index.less | 2 ++ src/form/README.md | 4 ++-- src/form/README.zh-CN.md | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/calendar/test/__snapshots__/index.spec.js.snap b/src/calendar/test/__snapshots__/index.spec.js.snap index 4beb11be8..fe58c9c40 100644 --- a/src/calendar/test/__snapshots__/index.spec.js.snap +++ b/src/calendar/test/__snapshots__/index.spec.js.snap @@ -47,7 +47,7 @@ exports[`color prop when type is range 1`] = ` -
+
`; @@ -98,7 +98,7 @@ exports[`color prop when type is single 1`] = ` -
+
`; @@ -152,7 +152,7 @@ exports[`formatter prop 1`] = ` -
+
`; @@ -206,7 +206,7 @@ exports[`popup wrapper 2`] = ` -
+
@@ -259,7 +259,7 @@ exports[`row-height prop 1`] = ` -
+
`; diff --git a/src/field/README.md b/src/field/README.md index 48f95a637..c1631a282 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -236,8 +236,8 @@ Use `input-align` prop to align the input value | arrow-direction `v2.0.4` | Can be set to `left` `up` `down` | *string* | `right` | | label-class | Label className | *any* | - | | label-width | Label width | *number \| string* | `90px` | -| 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` | +| label-align | Label align, can be set to `center` `right` | *string* | `left` | +| input-align | Input align, can be set to `center` `right` | *string* | `left` | | error-message-align | Error message align, can be set to `center` `right` | *string* | `left` | | autosize | Textarea auto resize，can accpet an object,
e.g. { maxHeight: 100, minHeight: 50 } | *boolean \| object* | `false` | | left-icon | Left side icon name | *string* | - | diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index 97acff9c0..3648b7996 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -256,7 +256,7 @@ export default { | label-class | 左侧文本额外类名 | *any* | - | | label-width | 左侧文本宽度，默认单位为`px` | *number \| string* | `90px` | | label-align | 左侧文本对齐方式，可选值为 `center` `right` | *string* | `left` | -| input-align | 输入框内容对齐方式，可选值为 `center` `right` | *string* | `left` | +| input-align | 输入框对齐方式，可选值为 `center` `right` | *string* | `left` | | error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | *string* | `left` | | autosize | 是否自适应内容高度，只对 textarea 有效，
可传入对象,如 { maxHeight: 100, minHeight: 50 }，
单位为`px` | *boolean \| object* | `false` | | left-icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | diff --git a/src/field/index.less b/src/field/index.less index 49650d5b4..f035a528c 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -55,10 +55,12 @@ } &--center { + justify-content: center; text-align: center; } &--right { + justify-content: flex-end; text-align: right; } diff --git a/src/form/README.md b/src/form/README.md index b3b52e57b..17e8739c6 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -406,8 +406,8 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| | label-width | Field label width | *number \| string* | `90px` | -| label-align | Field label text align, can be set to `center` `right` | *string* | `left` | -| input-align | Field input text align, can be set to `center` `right` | *string* | `left` | +| label-align | Field label align, can be set to `center` `right` | *string* | `left` | +| input-align | Field input align, can be set to `center` `right` | *string* | `left` | | error-message-align | Error message align, can be set to `center` `right` | *string* | `left` | | validate-first | Whether to stop the validation when a rule fails | *boolean* | `false` | diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index d349823de..a33b05a65 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -439,7 +439,7 @@ export default { |------|------|------|------| | label-width | 表单项文本宽度，默认单位为`px` | *number \| string* | `90px` | | label-align | 表单项文本对齐方式，可选值为 `center` `right` | *string* | `left` | -| input-align | 输入框内容对齐方式，可选值为 `center` `right` | *string* | `left` | +| input-align | 输入框对齐方式，可选值为 `center` `right` | *string* | `left` | | error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | *string* | `left` | | validate-first | 是否在某一项校验不通过时停止校验 | *boolean* | `false` |