Merge pull request #161 from Tencent/develop

v2.4.2
Tencent · Nov 25, 2020 · 21a3072 · 21a3072
2 parents ecc74d4 + f590b63
commit 21a3072
Show file tree

Hide file tree

Showing 130 changed files with 156 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### v2.4.2 (2020-11-25)
+
+#### Bugfixes
+* fix: 修复picker组件darkmode下的背景色适配问题
+* fix: 修复toast组件的旧版loading图标大小
+* fix: 修复msg组件英文文本词间断行问题
+
+
 ### v2.4.1 (2020-11-05)
 
 #### Features

diff --git a/dist/app.json b/dist/app.json
@@ -1,6 +1,7 @@
 {
   "pages": [
     "example/index",
+
     "example/button/button",
     "example/input/input",
     "example/form/form",
@@ -16,6 +17,7 @@
     "example/slideview/slideview",
     "example/slider/slider",
     "example/uploader/uploader",
+
     "example/article/article",
     "example/badge/badge",
     "example/flex/flex",
@@ -28,6 +30,7 @@
     "example/panel/panel",
     "example/preview/preview",
     "example/progress/progress",
+
     "example/actionsheet/actionsheet",
     "example/half-screen-dialog/half-screen-dialog",
     "example/dialog/dialog",
@@ -39,8 +42,10 @@
     "example/picker/picker",
     "example/toast/toast",
     "example/top-tips/top-tips",
+
     "example/navigation-bar/navigation-bar",
     "example/tabbar/tabbar",
+
     "example/searchbar/searchbar"
   ],
   "window": {
@@ -56,6 +61,5 @@
     "downloadFile": 10000
   },
   "style": "v2",
-  "debug": true,
-  "sitemapLocation": "sitemap.json"
-}
+  "debug": true
+}
diff --git a/dist/app.wxss b/dist/app.wxss
diff --git a/dist/example/actionsheet/actionsheet.wxss b/dist/example/actionsheet/actionsheet.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/article/article.wxss b/dist/example/article/article.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/badge/badge.wxss b/dist/example/badge/badge.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/button/button.wxss b/dist/example/button/button.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/dialog/dialog.wxss b/dist/example/dialog/dialog.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/flex/flex.wxss b/dist/example/flex/flex.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/footer/footer.wxss b/dist/example/footer/footer.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form.wxss b/dist/example/form/form.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_checkbox.wxss b/dist/example/form/form_checkbox.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_input_status.wxss b/dist/example/form/form_input_status.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_page.wxss b/dist/example/form/form_page.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_radio.wxss b/dist/example/form/form_radio.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_select.wxss b/dist/example/form/form_select.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_switch.wxss b/dist/example/form/form_switch.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_textarea.wxss b/dist/example/form/form_textarea.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/form/form_vcode.wxss b/dist/example/form/form_vcode.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/gallery/gallery.wxss b/dist/example/gallery/gallery.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/half-screen-dialog/half-screen-dialog.wxss b/dist/example/half-screen-dialog/half-screen-dialog.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/icons/icons.wxss b/dist/example/icons/icons.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/index.wxss b/dist/example/index.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/list/list.wxss b/dist/example/list/list.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */
diff --git a/dist/example/loading/loading.wxss b/dist/example/loading/loading.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/loadmore/loadmore.wxss b/dist/example/loadmore/loadmore.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/msg/msg.wxss b/dist/example/msg/msg.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/msg/msg_success.wxss b/dist/example/msg/msg_success.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/msg/msg_text.wxss b/dist/example/msg/msg_text.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/msg/msg_text_primary.wxss b/dist/example/msg/msg_text_primary.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/msg/msg_warn.wxss b/dist/example/msg/msg_warn.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/navbar/navbar.wxss b/dist/example/navbar/navbar.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/navigation-bar/navigation-bar.wxss b/dist/example/navigation-bar/navigation-bar.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/picker/picker.wxss b/dist/example/picker/picker.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/preview/preview.wxss b/dist/example/preview/preview.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/progress/progress.wxss b/dist/example/progress/progress.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/searchbar/searchbar.wxss b/dist/example/searchbar/searchbar.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/slider/slider.wxss b/dist/example/slider/slider.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/slideview/slideview.wxss b/dist/example/slideview/slideview.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/tabbar/tabbar.wxss b/dist/example/tabbar/tabbar.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/toast/toast.wxss b/dist/example/toast/toast.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/example/top-tips/top-tips.wxss b/dist/example/top-tips/top-tips.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/style/base/fn.wxss b/dist/style/base/fn.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/style/base/mixin/mobile.wxss b/dist/style/base/mixin/mobile.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */
diff --git a/dist/style/base/mixin/setArrow.wxss b/dist/style/base/mixin/setArrow.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */
diff --git a/dist/style/base/mixin/setLoading.wxss b/dist/style/base/mixin/setLoading.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */
diff --git a/dist/style/base/mixin/setOnepx.wxss b/dist/style/base/mixin/setOnepx.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/style/base/mixin/text.wxss b/dist/style/base/mixin/text.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */
diff --git a/dist/style/base/patch.wxss b/dist/style/base/patch.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/style/base/patch/weui-dot-loading.wxss b/dist/style/base/patch/weui-dot-loading.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/style/base/patch/weui-form.wxss b/dist/style/base/patch/weui-form.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist/style/base/patch/weui-gallery.wxss b/dist/style/base/patch/weui-gallery.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.4.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.4.2 (https://github.com/weui/weui-wxss)
  * Copyright 2020 Tencent, Inc.
  * Licensed under the MIT license
  */