Merge pull request #810 from uxsi/develop

uploader patch
Tencent · Sep 18, 2019 · 0c770dd · 0c770dd
2 parents 48daead + fa820b4
commit 0c770dd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,18 @@
+### [v2.1.3](https://github.com/Tencent/weui/compare/v2.1.2...v2.1.3) (2019-09-18)
+
+#### Style
+* style: 修复form场景下uploader布局兼容问题([6eba009](https://github.com/Tencent/weui/commit/6eba009))
+
+
+
 ### [v2.1.2](https://github.com/Tencent/weui/compare/v2.1.1...v2.1.2) (2019-09-17)
 
 #### Features
 * feat: 增加模拟选择框([3d081fd](https://github.com/Tencent/weui/commit/3d081fd))
 * feat: 升级表单UI，新增form页面模板，cell新增`weui-cells__group`结构，加扩展`weui-cells__group_form`可显示表单新皮肤([59ac11f](https://github.com/Tencent/weui/commit/59ac11f))
 
 #### Style
+* style: 对固定底部的footer增加刘海屏安全区域([816a631](https://github.com/Tencent/weui/commit/816a631))
 * style: 更正表单cell的点击态场景([eafb43e](https://github.com/Tencent/weui/commit/eafb43e))
 * style: 更新表单demo样式([ba4e192](https://github.com/Tencent/weui/commit/ba4e192))
 * style: 优化switch UI([0206f0c](https://github.com/Tencent/weui/commit/0206f0c))

diff --git a/dist/style/weui.css b/dist/style/weui.css
diff --git a/dist/style/weui.min.css b/dist/style/weui.min.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "weui",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "description": "A UI library by WeChat official design team, includes the most useful widgets/modules in mobile web applications.",
     "keywords": [
         "weui",

diff --git a/src/style/widget/weui-cell/weui-uploader.less b/src/style/widget/weui-cell/weui-uploader.less
@@ -16,7 +16,9 @@
 
 @import "../../base/fn";
 
-.weui-uploader{}
+.weui-uploader{
+  flex:1;
+}
 .weui-uploader__hd{
     display: flex;
     padding-bottom: @weuiCellGapV;