Merge pull request #180 from Tencent/develop

v2.5.6
Tencent · Apr 7, 2022 · 21f4674 · 21f4674
2 parents bb5ff37 + 28c1510
commit 21f4674
Show file tree

Hide file tree

Showing 338 changed files with 2,097 additions and 638 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+### v2.5.6 (2022-04-06)
+
+#### Features
+* feat: 新增单选框、复选框、开关组件的置灰态
+
+#### Bugfixes
+* fix: 优化半屏弹窗按钮布局，保证向前兼容
+* fix: 修复steps组件缺少初始化状态问题、新增icon-prev状态
+* fix: 优化底部悬浮按钮间距实现方式
+* fix: 去掉无用的weui-cell_access背景颜色点击态实现
+* fix: 优化example体验
+
+
+
+### v2.5.5 (2022-03-03)
+
+#### Features
+* feat: 增加步骤条组件
+* feat: weui-link增加点击态
+
+#### Bugfixes
+* fix: 修复actionsheet头部上下安全距离
+* fix: 修复navbar无障碍选中提示
+* fix: 调整输入框清除按钮间距
+
+
+
 ### v2.5.4 (2021-12-10)
 
 #### Bugfixes

diff --git a/dist-rpx-mode/app.json b/dist-rpx-mode/app.json
@@ -34,6 +34,9 @@
     "example/panel/panel",
     "example/preview/preview",
     "example/progress/progress",
+    "example/steps/steps",
+    "example/steps/steps_horizonal",
+    "example/steps/steps_vertical",
 
     "example/actionsheet/actionsheet",
     "example/half-screen-dialog/half-screen-dialog",

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,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}
diff --git a/dist-rpx-mode/example/article/article.wxss b/dist-rpx-mode/example/article/article.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}image{margin:8rpx 0}
diff --git a/dist-rpx-mode/example/badge/badge.wxss b/dist-rpx-mode/example/badge/badge.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 image{height:100rpx}.weui-cells .demo_badge_tips{font-size:34rpx;vertical-align:middle}.weui-cells .demo_badge_tips+.weui-badge{margin-left:10rpx;margin-right:10rpx}.demo_badge_cells .weui-cell__hd{position:relative;margin-right:20rpx}.demo_badge_cells .weui-cell__hd image{width:100rpx;display:block}.demo_badge_cells .weui-cell__hd .weui-badge{position:absolute;top:-.4em;right:-.4em}.demo_badge_cells .weui-cell__bd .demo_badge_title{vertical-align:middle}.demo_badge_cells .weui-cell__bd .demo_badge_title+.weui-badge{margin-left:10rpx}.demo_badge_cells .weui-cell__bd .demo_badge_desc{font-size:26rpx;color:#888}
diff --git a/dist-rpx-mode/example/button/button.wxss b/dist-rpx-mode/example/button/button.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background:var(--weui-BG-2)}.button-sp-area{padding-top:30rpx;text-align:center}.weui-btn_mini{margin-right:8rpx}
diff --git a/dist-rpx-mode/example/button/button_bottom_fixed.wxss b/dist-rpx-mode/example/button/button_bottom_fixed.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%;background:var(--weui-BG-2)}.weui-bottom-fixed-opr-demo{padding:64rpx 64rpx 0}
diff --git a/dist-rpx-mode/example/button/button_default.wxss b/dist-rpx-mode/example/button/button_default.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .button-sp-area{padding-top:30rpx;text-align:center}.weui-btn_mini{margin-right:8rpx}
diff --git a/dist-rpx-mode/example/dialog/dialog.wxss b/dist-rpx-mode/example/dialog/dialog.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}
diff --git a/dist-rpx-mode/example/flex/flex.wxss b/dist-rpx-mode/example/flex/flex.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .placeholder{margin:10rpx;padding:0 20rpx;text-align:center;background-color:var(--weui-BG-1);height:2.3em;line-height:2.3em;color:var(--weui-FG-1)}
diff --git a/dist-rpx-mode/example/footer/footer.wxss b/dist-rpx-mode/example/footer/footer.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .weui-footer{margin-bottom:100rpx}.weui-footer_fixed-bottom{margin-bottom:0}
diff --git a/dist-rpx-mode/example/form/form.wxss b/dist-rpx-mode/example/form/form.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%;background-color:var(--weui-BG-2)}
diff --git a/dist-rpx-mode/example/form/form_access.wxss b/dist-rpx-mode/example/form/form_access.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}
diff --git a/dist-rpx-mode/example/form/form_checkbox.js b/dist-rpx-mode/example/form/form_checkbox.js
@@ -4,6 +4,7 @@ Page({
     items: [
       { name: '1', value: 'standard is dealt for u.' },
       { name: '2', value: 'standard is dealicient for u.', checked: 'true' },
+      { name: '3', value: 'standard is for u', checked: 'true', disabled: 'true' },
     ],
   },
   checkboxChange(e) {

diff --git a/dist-rpx-mode/example/form/form_checkbox.wxml b/dist-rpx-mode/example/form/form_checkbox.wxml
@@ -8,12 +8,13 @@
 			<view class="weui-cells__group weui-cells__group_form">
 				<view class="weui-cells weui-cells_checkbox">
                     <checkbox-group bindchange="checkboxChange">
-                        <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{items}}" wx:key="name">
+                        <label class="weui-cell weui-cell_active weui-check__label {{item.disabled ? 'weui-cell_disabled' : ''}}" wx:for="{{items}}" wx:key="name">
                             <view class="weui-cell__hd">
                                 <checkbox
                                     class="weui-check"
                                     value="{{item.name}}"
                                     checked="{{item.checked}}"
+                                    disabled="{{item.disabled}}"
                                 />
                                 <i class="weui-icon-checked"></i>
                             </view>

diff --git a/dist-rpx-mode/example/form/form_checkbox.wxss b/dist-rpx-mode/example/form/form_checkbox.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}
diff --git a/dist-rpx-mode/example/form/form_input_status.wxss b/dist-rpx-mode/example/form/form_input_status.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}.weui-label{width:3.1em}.weui-toptips{display:block;opacity:0;visibility:hidden;-webkit-transition:opacity .3s;transition:opacity .3s}.show_toptips{visibility:visible;opacity:1}
diff --git a/dist-rpx-mode/example/form/form_page.wxss b/dist-rpx-mode/example/form/form_page.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}.weui-label{width:4.1em}
diff --git a/dist-rpx-mode/example/form/form_radio.wxss b/dist-rpx-mode/example/form/form_radio.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}
diff --git a/dist-rpx-mode/example/form/form_select.wxss b/dist-rpx-mode/example/form/form_select.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}
diff --git a/dist-rpx-mode/example/form/form_switch.wxml b/dist-rpx-mode/example/form/form_switch.wxml
@@ -16,6 +16,15 @@
                       <view class="weui-switch-cp__box"></view>
                   </view>
               </view>
+          </label>
+          <label class="weui-cell weui-cell_active weui-cell_switch weui-cell_disabled">
+              <view class="weui-cell__bd">标题文字</view>
+              <view class="weui-cell__ft">
+                  <view class="weui-switch-cp">
+                      <checkbox class="weui-switch-cp__input" checked="true" disabled="true" />
+                      <view class="weui-switch-cp__box"></view>
+                  </view>
+              </view>
           </label>
 				</view>
 			</view>

diff --git a/dist-rpx-mode/example/form/form_switch.wxss b/dist-rpx-mode/example/form/form_switch.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}
diff --git a/dist-rpx-mode/example/form/form_textarea.wxss b/dist-rpx-mode/example/form/form_textarea.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}
diff --git a/dist-rpx-mode/example/form/form_vcode.wxss b/dist-rpx-mode/example/form/form_vcode.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%}.weui-label{width:3.1em}
diff --git a/dist-rpx-mode/example/gallery/gallery.wxss b/dist-rpx-mode/example/gallery/gallery.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}
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,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}[weui-modal-show=false] .weui-half-screen-dialog{-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;-webkit-transform:translateY(100%);transform:translateY(100%)}[weui-modal-show=true] .weui-half-screen-dialog{-webkit-transform:translateY(0);transform:translateY(0)}
diff --git a/dist-rpx-mode/example/icons/icons.wxss b/dist-rpx-mode/example/icons/icons.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 icon{margin-right:26rpx}.page__bd{padding-left:80rpx;padding-right:80rpx;text-align:left}.icon-box{margin-bottom:50rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.icon-box i{margin-right:36rpx}.icon-box__ctn{-webkit-flex-shrink:100;flex-shrink:100}.icon-box__title{font-size:40rpx}.icon-box__desc{margin-top:12rpx;font-size:24rpx;color:#888}.icon_sp_area{margin-top:20rpx;text-align:left}
diff --git a/dist-rpx-mode/example/index.js b/dist-rpx-mode/example/index.js
@@ -12,7 +12,7 @@ Page({
         id: 'layout',
         name: '基础组件',
         open: false,
-        pages: ['article', 'badge', 'flex', 'footer', 'gallery', 'grid', 'icons', 'loading', 'loadmore', 'panel', 'preview', 'progress'],
+        pages: ['article', 'badge', 'flex', 'footer', 'gallery', 'grid', 'icons', 'loading', 'loadmore', 'panel', 'preview', 'progress', 'steps'],
       },
       {
         id: 'feedback',

diff --git a/dist-rpx-mode/example/index.wxss b/dist-rpx-mode/example/index.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .weui-flex{-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cells{margin-top:0;opacity:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-transition:.3s;transition:.3s}.weui-cells:after,.weui-cells:before{display:none}.weui-cells_show{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}.weui-cell:before{right:30rpx}.kind-list__item{margin:20rpx 0;background-color:var(--weui-BG-2);border-radius:4rpx;overflow:hidden}.kind-list__item:first-child{margin-top:0}.kind-list__img{width:60rpx;height:60rpx}[data-weui-theme=dark] .kind-list__img{-webkit-filter:invert(100) hue-rotate(180deg);filter:invert(100) hue-rotate(180deg)}.kind-list__item-hd{padding:40rpx;-webkit-transition:opacity .3s;transition:opacity .3s}.kind-list__item-hd_show{opacity:.4}.kind-list__item-bd{height:0;overflow:hidden}.kind-list__item-bd_show{height:auto}
diff --git a/dist-rpx-mode/example/input/input.wxss b/dist-rpx-mode/example/input/input.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .weui-vcode-img{width:216rpx}
diff --git a/dist-rpx-mode/example/list/list.wxss b/dist-rpx-mode/example/list/list.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .weui-cell__hd{font-size:0}.weui-cell__hd image{margin-right:32rpx;vertical-align:middle;width:40rpx;height:40rpx}
diff --git a/dist-rpx-mode/example/loading/loading.wxml b/dist-rpx-mode/example/loading/loading.wxml
@@ -13,6 +13,9 @@
           <view aria-role="img" aria-label="加载中" class="weui-primary-loading weui-primary-loading_brand">
             <view class="weui-primary-loading__dot"></view>
           </view>
+          <view aria-role="img" aria-label="加载中" class="weui-primary-loading weui-primary-loading_transparent">
+            <view class="weui-primary-loading__dot"></view>
+          </view>
       </view>
       <view class="weui-loading__wrp">
           <view aria-role="img" aria-label="加载中" class="loading wx_dot_loading"></view>

diff --git a/dist-rpx-mode/example/loading/loading.wxss b/dist-rpx-mode/example/loading/loading.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
-.page{background-color:var(--weui-BG-2)}.weui-loading__wrp{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;padding:32rpx}.weui-loading__wrp .weui-loading,.weui-loading__wrp .weui-primary-loading{margin:0 20rpx}.weui-loading__wrp:last-child{background-color:rgba(0,0,0,.1)}
+.page{background-color:var(--weui-BG-0)}.weui-loading__wrp{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;padding:32rpx}.weui-loading__wrp .weui-loading,.weui-loading__wrp .weui-primary-loading{margin:0 20rpx}.weui-loading__wrp:last-child{background-color:rgba(0,0,0,.1)}
diff --git a/dist-rpx-mode/example/loadmore/loadmore.wxss b/dist-rpx-mode/example/loadmore/loadmore.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}
diff --git a/dist-rpx-mode/example/msg/msg.wxss b/dist-rpx-mode/example/msg/msg.wxss
@@ -1,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{background-color:var(--weui-BG-2)}
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,6 +1,6 @@
 /*!
- * WeUI v2.5.4 (https://github.com/weui/weui-wxss)
- * Copyright 2021 Tencent, Inc.
+ * WeUI v2.5.6 (https://github.com/weui/weui-wxss)
+ * Copyright 2022 Tencent, Inc.
  * Licensed under the MIT license
  */
 .page{height:100%;background-color:var(--weui-BG-2)}