Merge pull request #185 from Tencent/develop

feat: v2.5.8
Tencent · May 27, 2022 · de278f2 · de278f2
2 parents c322f70 + 101fe40
commit de278f2
Show file tree

Hide file tree

Showing 297 changed files with 327 additions and 296 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### v2.5.8 (2022-05-27)
+
+#### Bugfixes
+* fix: 优化默认字体序列
+
+
+
 ### v2.5.7 (2022-05-27)
 
 #### Bugfixes

diff --git a/dist-rpx-mode/app.wxss b/dist-rpx-mode/app.wxss
diff --git a/dist-rpx-mode/example/actionsheet/actionsheet.wxss b/dist-rpx-mode/example/actionsheet/actionsheet.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

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

diff --git a/dist-rpx-mode/example/button/button_bottom_fixed.wxss b/dist-rpx-mode/example/button/button_bottom_fixed.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/button/button_default.wxss b/dist-rpx-mode/example/button/button_default.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

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

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

diff --git a/dist-rpx-mode/example/form/form_access.wxss b/dist-rpx-mode/example/form/form_access.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/dist-rpx-mode/example/input/input.wxss b/dist-rpx-mode/example/input/input.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/list/list.wxss b/dist-rpx-mode/example/list/list.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/loading/loading.wxss b/dist-rpx-mode/example/loading/loading.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

diff --git a/dist-rpx-mode/example/msg/msg_custom_area_cell.wxss b/dist-rpx-mode/example/msg/msg_custom_area_cell.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/msg/msg_custom_area_preview.wxss b/dist-rpx-mode/example/msg/msg_custom_area_preview.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/msg/msg_custom_area_tips.wxss b/dist-rpx-mode/example/msg/msg_custom_area_tips.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

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

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

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

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

diff --git a/dist-rpx-mode/example/panel/panel.wxss b/dist-rpx-mode/example/panel/panel.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

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

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

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

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

diff --git a/dist-rpx-mode/example/steps/steps.wxss b/dist-rpx-mode/example/steps/steps.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/steps/steps_horizonal.js b/dist-rpx-mode/example/steps/steps_horizonal.js
@@ -0,0 +1,4 @@
+Page({
+  mixins: [require('../../mixin/common')],
+});
+
diff --git a/dist-rpx-mode/example/steps/steps_horizonal.wxss b/dist-rpx-mode/example/steps/steps_horizonal.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

diff --git a/dist-rpx-mode/example/steps/steps_vertical.js b/dist-rpx-mode/example/steps/steps_vertical.js
@@ -0,0 +1,4 @@
+Page({
+  mixins: [require('../../mixin/common')],
+});
+
diff --git a/dist-rpx-mode/example/steps/steps_vertical.wxss b/dist-rpx-mode/example/steps/steps_vertical.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

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

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

diff --git a/dist-rpx-mode/style/base/a11y.wxss b/dist-rpx-mode/style/base/a11y.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */

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

diff --git a/dist-rpx-mode/style/base/mixin/btnWrapLayout.wxss b/dist-rpx-mode/style/base/mixin/btnWrapLayout.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
diff --git a/dist-rpx-mode/style/base/mixin/mobile.wxss b/dist-rpx-mode/style/base/mixin/mobile.wxss
@@ -1,5 +1,5 @@
 /*!
- * WeUI v2.5.7 (https://github.com/weui/weui-wxss)
+ * WeUI v2.5.8 (https://github.com/weui/weui-wxss)
  * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */