fix(upload): fix displayed vertically in n-form in image-card mode, closes #1746. fix file list's top margin if trigger is hidden

CHANGELOG.en-US.md

@@ -6,6 +6,8 @@
 
 - Fix `n-upload` still shows upload trigger when max limit is reached in `image-card` mode, closes [#1744](https://github.com/TuSimple/naive-ui/issues/1744).
 - Fix `n-form`'s `FormValidate` type lacks `shouldRuleBeApplied` parameter, closes [#1747](https://github.com/TuSimple/naive-ui/issues/1747).
+- Fix `n-upload` is displayed vertically in `n-form` in `image-card` mode, closes [#1746](https://github.com/TuSimple/naive-ui/issues/1746).
+- Fix `n-upload`'s file list's top margin if trigger is hidden.
 
 ### Feats
 

CHANGELOG.zh-CN.md

@@ -6,6 +6,8 @@
 
 - 修复 `n-upload` 在 `image-card` 模式下，达到最大上传数量后仍然展示上传按钮，关闭 [#1744](https://github.com/TuSimple/naive-ui/issues/1744)
 - 修复 `n-form` 的 `FormValidate` 类型缺少 `shouldRuleBeApplied` 参数，关闭 [#1747](https://github.com/TuSimple/naive-ui/issues/1747)
+- 修复 `n-upload` 在 `image-card` 模式时在表格中被展示为垂直的样式，关闭 [#1746](https://github.com/TuSimple/naive-ui/issues/1746).
+- 修复 `n-upload` 文件列表在不显示触发区域的时候的 margin-top
 
 ### Feats
 

src/upload/src/styles/index.cssr.ts

@@ -3,7 +3,7 @@ import fadeInHeightExpand from '../../../_styles/transitions/fade-in-height-expa
 import createIconSwitchTransition from '../../../_styles/transitions/icon-switch.cssr'
 
 export default c([
-  cB('upload', [
+  cB('upload', 'width: 100%;', [
     cM('dragger-inside', [
       cE('trigger', `
         display: block;
@@ -44,6 +44,9 @@ export default c([
     opacity: 1;
     transition: opacity .3s var(--bezier);
   `, [
+    c('+', [
+      cB('upload-file-list', 'margin-top: 8px;')
+    ]),
     cM('disabled', `
       opacity: var(--item-disabled-opacity);
       cursor: not-allowed;
@@ -66,7 +69,6 @@ export default c([
     ])
   ]),
   cB('upload-file-list', `
-    margin-top: 8px;
     line-height: var(--line-height);
     opacity: 1;
     transition: opacity .3s var(--bezier);