fix: #1376

XiaoMi · Dec 3, 2020 · 08622db · 08622db
1 parent b97410d
commit 08622db
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,7 +22,7 @@
 - 优化 `Select` 下拉框展开收起，输入框内容存在显示差异[#1380](https://github.com/XiaoMi/hiui/issues/1380)
 - 修复 `Select` 滚动报错问题[#1390](https://github.com/XiaoMi/hiui/issues/1390)
 - 优化 `Search` 后置元素应该收起下来选项 [#1341](https://github.com/XiaoMi/hiui/issues/1341)
-- 优化 `Form` 组件 label 内容显示折行行高以及间距 [#1341](https://github.com/XiaoMi/hiui/issues/1341)
+- 优化 `Form` 组件 label 内容显示折行行高以及间距 [#1376](https://github.com/XiaoMi/hiui/issues/1376)
 - 优化 `Pagination` 国际化翻译 [#1381](https://github.com/XiaoMi/hiui/issues/1381)
 - 修复 `Table` rowSelection 存在时的列冻结异常 [#1393](https://github.com/XiaoMi/hiui/issues/1393)
 - 修复 `Table` 国际化问题 [#1397](https://github.com/XiaoMi/hiui/issues/1397)

diff --git a/components/form/form-legacy/form-v2/style/index.scss b/components/form/form-legacy/form-v2/style/index.scss
@@ -44,28 +44,6 @@
     }
   }
 
-  &--label--top {
-    padding-right: 0;
-    text-align: left;
-
-    &.hi-form--inline {
-      // 上下布局只在水平表单中自动填充高度
-      .hi-form-item--legacy__span {
-        min-height: 32px;
-      }
-    }
-
-    .hi-form-item--legacy {
-      flex-direction: column;
-
-      .hi-form-item--legacy__label {
-        height: 22px;
-        padding-right: 8px;
-        margin-bottom: 8px;
-      }
-    }
-  }
-
   .hi-form-item--legacy {
     display: flex;
     font-size: $font-size-normal;
@@ -138,4 +116,27 @@
       right: 0;
     }
   }
+
+  &--label--top {
+    padding-right: 0;
+    text-align: left;
+
+    &.hi-form--inline {
+      // 上下布局只在水平表单中自动填充高度
+      .hi-form-item--legacy__span {
+        min-height: 32px;
+      }
+    }
+
+    .hi-form-item--legacy {
+      flex-direction: column;
+      margin-bottom: 20px;
+
+      .hi-form-item--legacy__label {
+        height: 22px;
+        padding-right: 8px;
+        margin-bottom: 8px;
+      }
+    }
+  }
 }
diff --git a/components/form/style/index.scss b/components/form/style/index.scss
@@ -51,7 +51,6 @@
   &--label--top {
     padding-right: 0;
     text-align: left;
-
     &.hi-form--inline {
       // 上下布局只在水平表单中自动填充高度
       .hi-form-item__span {
@@ -61,6 +60,7 @@
 
     .hi-form-item {
       flex-direction: column;
+      margin-bottom: 20px;
 
       .hi-form-item__label {
         height: 22px;