From e19775c26a36f40e86958410db45957a3dad39d5 Mon Sep 17 00:00:00 2001 From: Wugaoliang Date: Wed, 25 Nov 2020 14:53:39 +0800 Subject: [PATCH 1/3] fix: #1376 --- components/form/form-legacy/form-v2/style/index.scss | 7 +++++-- components/form/style/index.scss | 7 +++++-- docs/demo/form/section-align.jsx | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/components/form/form-legacy/form-v2/style/index.scss b/components/form/form-legacy/form-v2/style/index.scss index 70cc3a8f1..2cdec49c7 100644 --- a/components/form/form-legacy/form-v2/style/index.scss +++ b/components/form/form-legacy/form-v2/style/index.scss @@ -70,6 +70,7 @@ display: flex; font-size: $font-size-normal; margin-right: $spacer-2; + margin-bottom: 24px; &__label, &__span { @@ -81,9 +82,10 @@ } &__label { - min-height: 32px; + margin-top: 5px; + min-height: 22px; padding-right: $spacer-2; - line-height: 32px; + line-height: 22px; } &__content { @@ -107,6 +109,7 @@ } &--msg__error { + position: absolute; font-size: $font-size-small; min-height: 24px; padding: 2px 0; diff --git a/components/form/style/index.scss b/components/form/style/index.scss index 4a277389b..5d0a8d34b 100644 --- a/components/form/style/index.scss +++ b/components/form/style/index.scss @@ -75,6 +75,7 @@ display: flex; font-size: $font-size-normal; margin-right: $spacer-2; + margin-bottom: 24px; &__label, &__span { @@ -86,9 +87,10 @@ } &__label { - min-height: 32px; + margin-top: 5px; + min-height: 22px; padding-right: $spacer-2; - line-height: 32px; + line-height: 22px; } &__content { @@ -123,6 +125,7 @@ } &--msg__error { + position: absolute; font-size: $font-size-small; min-height: 24px; padding: 2px 0; diff --git a/docs/demo/form/section-align.jsx b/docs/demo/form/section-align.jsx index d1cf25b20..9e78af806 100644 --- a/docs/demo/form/section-align.jsx +++ b/docs/demo/form/section-align.jsx @@ -9,7 +9,7 @@ import Grid from '../../../components/grid' import Radio from '../../../components/radio' import Select from '../../../components/select' const prefix = 'form-align' -const rightOptions = ['左对齐', '右对齐', '顶对齐'] +const rightOptions = ['左对齐', '右对齐', '顶对齐','v2'] const desc = ['左对齐：表单项较少，对应标题字数易对齐工整'] const code = [ { From a9e2633da94cd05cf92f548158b23a870f94c58e Mon Sep 17 00:00:00 2001 From: Wugaoliang Date: Wed, 25 Nov 2020 14:54:27 +0800 Subject: [PATCH 2/3] fix: #1376 --- docs/demo/form/section-align.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/demo/form/section-align.jsx b/docs/demo/form/section-align.jsx index 9e78af806..d1cf25b20 100644 --- a/docs/demo/form/section-align.jsx +++ b/docs/demo/form/section-align.jsx @@ -9,7 +9,7 @@ import Grid from '../../../components/grid' import Radio from '../../../components/radio' import Select from '../../../components/select' const prefix = 'form-align' -const rightOptions = ['左对齐', '右对齐', '顶对齐','v2'] +const rightOptions = ['左对齐', '右对齐', '顶对齐'] const desc = ['左对齐：表单项较少，对应标题字数易对齐工整'] const code = [ { From 148d8b0dcae31308ddd619c79e4842955439ca83 Mon Sep 17 00:00:00 2001 From: Wugaoliang Date: Wed, 25 Nov 2020 15:26:18 +0800 Subject: [PATCH 3/3] fix: #1331 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0e79f1e4..6b7d27974 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,10 +12,11 @@ - 修复 `SelectTree` 下拉选择上滑动显示异常 [#1351](https://github.com/XiaoMi/hiui/issues/1351) - 修复 `Form` Form.List 和 Form.Item 同一级混用显示异常问题 [#1343](https://github.com/XiaoMi/hiui/issues/1343) - 修复 `DatePicker` weekOffset 为 1 时 周与日对照显示异常 [#1352](https://github.com/XiaoMi/hiui/issues/1352) -- 修复 `Input` type等于amount时，数据初始化展示问题以及添加前后置节点聚焦问题 [#1362](https://github.com/XiaoMi/hiui/pull/1362) +- 修复 `Input` type 等于 amount 时，数据初始化展示问题以及添加前后置节点聚焦问题 [#1362](https://github.com/XiaoMi/hiui/pull/1362) - 修复 `Select` 异步多选下拉数据显示问题 [#1364](https://github.com/XiaoMi/hiui/issues/1364) - 优化 `Select` 弹层触发方式 [#1358](https://github.com/XiaoMi/hiui/issues/1358) - 优化 `Search` 后置元素应该收起下来选项 [#1341](https://github.com/XiaoMi/hiui/issues/1341) +- 优化 `From` 组件 label 内容显示折行行高以及间距 [#1341](https://github.com/XiaoMi/hiui/issues/1341) - 新增 HiUI 基础样式 css 文件 [#1388](https://github.com/XiaoMi/hiui/issues/1388) ## 3.1.0