Skip to content

Commit

Permalink
feat: v2.5.15
Browse files Browse the repository at this point in the history
  • Loading branch information
uxsi committed Dec 26, 2022
1 parent e03624c commit 095a95f
Show file tree
Hide file tree
Showing 319 changed files with 854 additions and 580 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
### v2.5.15 (2022-12-26)

#### Features
* feat: 加入色板less变量
* feat: 色板新增红橙色

#### Bugfixes
* fix: 弹窗标题缺少默认字体颜色
* fix: 半屏弹窗demo动画效果
* fix: weui-animate的keyframe名增加weui前缀



### v2.5.14 (2022-09-16)

#### Bugfixes
Expand Down
4 changes: 2 additions & 2 deletions dist-rpx-mode/app.wxss

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist-rpx-mode/example/actionsheet/actionsheet.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/article/article.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/badge/badge.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/button/button.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/button/button_bottom_fixed.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/button/button_default.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/dialog/dialog.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/flex/flex.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/footer/footer.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_access.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_checkbox.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_input_status.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_page.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_radio.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_select.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_switch.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_textarea.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/form/form_vcode.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/gallery/gallery.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
71 changes: 47 additions & 24 deletions dist-rpx-mode/example/half-screen-dialog/half-screen-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,48 @@ Page({
dialog3: false,
dialog4: false,
dialog5: false,
show1: false,
show2: false,
show3: false,
show4: false,
show5: false,
wrap: false,
wrap1: false,
},
onShow() {
},
close() {
this.setData({
dialog1: false,
dialog2: false,
dialog3: false,
dialog4: false,
dialog5: false,
});

var that = this;
setTimeout(function(){
that.setData({
show1: false,
show2: false,
show3: false,
show4: false,
show5: false,
});
}, 400);
},
open1() {
this.setData({
dialog1: true,
show1: true,
});
},
open2() {
this.setData({
dialog2: true,
show2: true,
});

const promise1 = new Promise((resolve, reject) => {
wx.createSelectorQuery().select('#js_btn1_1')
.boundingClientRect((rect) => {
Expand All @@ -29,6 +67,13 @@ Page({
this.setData({ wrap: true });
}
});
},
open3() {
this.setData({
dialog3: true,
show3: true,
});

const promise3 = new Promise((resolve, reject) => {
wx.createSelectorQuery().select('#js_btn2_1')
.boundingClientRect((rect) => {
Expand All @@ -49,38 +94,16 @@ Page({
}
});
},
close() {
this.setData({
dialog1: false,
dialog2: false,
dialog3: false,
dialog4: false,
dialog5: false,
});
},
open1() {
this.setData({
dialog1: true,
});
},
open2() {
this.setData({
dialog2: true,
});
},
open3() {
this.setData({
dialog3: true,
});
},
open4() {
this.setData({
dialog4: true,
show4: true,
});
},
open5() {
this.setData({
dialog5: true,
show5: true,
});
},
});
30 changes: 15 additions & 15 deletions dist-rpx-mode/example/half-screen-dialog/half-screen-dialog.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<view aria-role="button" class="weui-btn weui-btn_default" bindtap="open5">样式五</view>
</view>

<view wx:if="{{dialog1}}" aria-role="dialog" aria-modal="true" aria-labelledby="js_dialog1_title">
<view class="weui-mask weui-transition {{dialog1 ? 'weui-transition_show' : ''}}" bindtap="close"></view>
<view class="weui-half-screen-dialog weui-transition {{dialog1 ? 'weui-transition_show' : ''}}">
<view wx:if="{{dialog1 || show1}}" aria-role="dialog" aria-modal="true" aria-labelledby="js_dialog1_title">
<view class="weui-mask {{dialog1 ? 'weui-animate_fade-in' : 'weui-animate_fade-out'}}" bindtap="close"></view>
<view class="weui-half-screen-dialog {{dialog1 ? 'weui-animate_slide-up' : 'weui-animate_slide-down'}}">
<view class="weui-half-screen-dialog__hd">
<view class="weui-half-screen-dialog__hd__side">
<view aria-role="button" class="weui-btn_icon weui-wa-hotarea" bindtap="close">关闭<i class="weui-icon-close-thin"></i></view>
Expand All @@ -30,9 +30,9 @@
</view>
</view>
</view>
<view wx:if="{{dialog2}}" aria-role="dialog" aria-modal="true" aria-labelledby="js_dialog2_title">
<view class="weui-mask weui-transition {{dialog2 ? 'weui-transition_show' : ''}}" bindtap="close" aria-role="button" aria-label="关闭"></view>
<view class="weui-half-screen-dialog weui-half-screen-dialog_bottom-fixed weui-transition {{dialog2 ? 'weui-transition_show' : ''}}">
<view wx:if="{{dialog2 || show2}}" aria-role="dialog" aria-modal="true" aria-labelledby="js_dialog2_title">
<view class="weui-mask {{dialog2 ? 'weui-animate_fade-in' : 'weui-animate_fade-out'}}" bindtap="close" aria-role="button" aria-label="关闭"></view>
<view class="weui-half-screen-dialog weui-half-screen-dialog_bottom-fixed {{dialog2 ? 'weui-animate_slide-up' : 'weui-animate_slide-down'}}">
<view class="weui-half-screen-dialog__hd">
<view class="weui-half-screen-dialog__hd__side" bindtap="close">
<view aria-role="button" style="display:none;" class="weui-btn_icon weui-wa-hotarea">返回<i class="weui-icon-back-arrow-thin"></i></view>
Expand Down Expand Up @@ -70,9 +70,9 @@
</view>
</view>
</view>
<view wx:if="{{dialog3}}" aria-role="dialog" aria-modal="true">
<view class="weui-mask weui-transition {{dialog3 ? 'weui-transition_show' : ''}}" bindtap="close" aria-role="button" aria-label="关闭"></view>
<view class="weui-half-screen-dialog weui-transition {{dialog3 ? 'weui-transition_show' : ''}} {{wrap1 ? 'weui-half-screen-dialog_btn-wrap' : ''}}">
<view wx:if="{{dialog3 || show3}}" aria-role="dialog" aria-modal="true">
<view class="weui-mask {{dialog3 ? 'weui-animate_fade-in' : 'weui-animate_fade-out'}}" bindtap="close" aria-role="button" aria-label="关闭"></view>
<view class="weui-half-screen-dialog weui-transition {{dialog3 ? 'weui-animate_slide-up' : 'weui-animate_slide-down'}} {{wrap1 ? 'weui-half-screen-dialog_btn-wrap' : ''}}">
<view class="weui-half-screen-dialog__hd">
<view class="weui-half-screen-dialog__hd__side" bindtap="close">
<view aria-role="button" class="weui-btn_icon">关闭<i class="weui-icon-close-thin"></i></view>
Expand All @@ -95,9 +95,9 @@
</view>
</view>
</view>
<view wx:if="{{dialog4}}" aria-role="dialog" aria-modal="true">
<view class="weui-mask weui-transition {{dialog4 ? 'weui-transition_show' : ''}}" bindtap="close" aria-role="button" aria-label="关闭"></view>
<view class="weui-half-screen-dialog weui-half-screen-dialog_large weui-transition {{dialog4 ? 'weui-transition_show' : ''}}">
<view wx:if="{{dialog4 || show4}}" aria-role="dialog" aria-modal="true">
<view class="weui-mask {{dialog4 ? 'weui-animate_fade-in' : 'weui-animate_fade-out'}}" bindtap="close" aria-role="button" aria-label="关闭"></view>
<view class="weui-half-screen-dialog weui-half-screen-dialog_large {{dialog4 ? 'weui-animate_slide-up' : 'weui-animate_slide-down'}}">
<view class="weui-half-screen-dialog__hd">
<view class="weui-half-screen-dialog__hd__side" bindtap="close">
<view aria-role="button" class="weui-btn_icon">关闭<i class="weui-icon-close-thin"></i></view>
Expand All @@ -116,9 +116,9 @@
</view>
</view>
</view>
<view wx:if="{{dialog5}}" aria-role="dialog" aria-modal="true" aria-labelledby="js_dialog5_title">
<view class="weui-mask weui-transition {{dialog5 ? 'weui-transition_show' : ''}}" bindtap="close"></view>
<view class="weui-half-screen-dialog weui-half-screen-dialog_slide weui-transition {{dialog5 ? 'weui-transition_show' : ''}}">
<view wx:if="{{dialog5 || show5}}" aria-role="dialog" aria-modal="true" aria-labelledby="js_dialog5_title">
<view class="weui-mask {{dialog5 ? 'weui-animate_fade-in' : 'weui-animate_fade-out'}}" bindtap="close"></view>
<view class="weui-half-screen-dialog weui-half-screen-dialog_slide {{dialog5 ? 'weui-animate_slide-up' : 'weui-animate_slide-down'}}">
<view class="weui-half-screen-dialog__hd">
<view style="height:4px;border-radius:2px;" class="weui-half-screen-dialog__slide-icon">
<view style="opaicty:0;" class="weui-icon-arrow"></view>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/icons/icons.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/index.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/input/input.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/list/list.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/loading/loading.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/loadmore/loadmore.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/msg/msg.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/msg/msg_custom_area_cell.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-rpx-mode/example/msg/msg_custom_area_preview.wxss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* WeUI v2.5.14 (https://github.com/weui/weui-wxss)
* WeUI v2.5.15 (https://github.com/weui/weui-wxss)
* Copyright 2022 Tencent, Inc.
* Licensed under the MIT license
*/
Expand Down
Loading

0 comments on commit 095a95f

Please sign in to comment.