Skip to content

Commit

Permalink
feat: v2.5.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@uxsi
uxsi committed Jan 16, 2023
1 parent 992f9c8 commit 0c59631
Show file tree
Hide file tree
Showing 19 changed files with 181 additions and 135 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
### v2.5.16 (2023-01-16)

#### Features
* feat: 升级picker样式
* feat: 升级loading样式

#### Bugfixes
* fix: 统一“正在加载”文案



### v2.5.15 (2022-12-26)

#### Features
Expand Down
2 changes: 1 addition & 1 deletion dist/example/example.css
View file

Large diffs are not rendered by default.

36 changes: 17 additions & 19 deletions dist/example/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,13 +467,14 @@ <h1 class="page__title">Button</h1>

<div class="button-sp-area">
<a href="javascript:" role="button" class="weui-btn weui-btn_primary">主要操作</a>
<a href="javascript:" role="button" title="等待中" class="weui-btn weui-btn_primary weui-btn_loading"><span class="weui-primary-loading weui-primary-loading_transparent"><i class="weui-primary-loading__dot"></i></span>主要操作</a>
<a href="javascript:" role="button" title="正在操作" class="weui-btn weui-btn_primary weui-btn_loading"><i class="weui-mask-loading"></i>主要操作</a>
<a href="javascript:" role="button" title="正在操作" class="weui-btn weui-btn_primary weui-btn_loading"><i class="weui-mask-loading"></i></span>主要操作</a>
<a href="javascript:" role="button" aria-disabled="true" disabled class="weui-btn weui-btn_disabled weui-btn_primary">主要操作</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_default">次要操作</a>
<a href="javascript:" role="button" title="等待中" class="weui-btn weui-btn_default weui-btn_loading"><span class="weui-primary-loading"><i class="weui-primary-loading__dot"></i></span>次要操作</a>
<a href="javascript:" role="button" title="正在操作" class="weui-btn weui-btn_default weui-btn_loading"><i class="weui-mask-loading"></i>次要操作</a>
<a href="javascript:" role="button" aria-disabled="true" disabled class="weui-btn weui-btn_disabled weui-btn_default">次要操作</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_warn">警示操作</a>
<a href="javascript:" role="button" title="等待中" class="weui-btn weui-btn_warn weui-btn_loading"><span class="weui-primary-loading"><i class="weui-primary-loading__dot"></i></span>警示操作</a>
<a href="javascript:" role="button" title="正在操作" class="weui-btn weui-btn_warn weui-btn_loading"><i class="weui-mask-loading"></i>警示操作</a>
<a href="javascript:" role="button" aria-disabled="true" disabled class="weui-btn weui-btn_disabled weui-btn_warn">警示操作</a>
</div>

Expand Down Expand Up @@ -2009,7 +2010,7 @@ <h1 class="page__title">Toast</h1>
<a href="javascript:" role="button" class="weui-btn weui-btn_default" id="showToast">成功提示</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_default" id="showWarnToast">失败提示</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_default" id="showTextMoreToast">长文案提示</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_default" id="showLoadingToast">加载中提示</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_default" id="showLoadingToast">正在加载提示</a>
<a href="javascript:" role="button" class="weui-btn weui-btn_default" id="showTextToast">文字提示</a>
</div>

Expand Down Expand Up @@ -2047,7 +2048,7 @@ <h1 class="page__title">Toast</h1>
<span class="weui-primary-loading weui-icon_toast">
<span class="weui-primary-loading__dot"></span>
</span>
<p class="weui-toast__content">加载中</p>
<p class="weui-toast__content">正在加载</p>
</div>
</div>

Expand Down Expand Up @@ -3736,7 +3737,8 @@ <h1 class="page__title">Picker</h1>
onConfirm: function (result) {
console.log(result);
},
title: '单列选择器'
title: '单列选择器',
showClose: false
});
});
$('#showDatePicker').on('click', function () {
Expand Down Expand Up @@ -3860,20 +3862,16 @@ <h1 class="page__title">Flex</h1>
<div class="page">
<div class="page__hd">
<h1 class="page__title">Loading</h1>
<p class="page__desc">加载中</p>
<p class="page__desc">正在加载</p>
</div>
<div class="page__bd">
<div class="loading_demo">
<i role="img" aria-label="加载中" class="weui-loading"></i>
<span role="img" aria-label="加载中" class="weui-primary-loading">
<span class="weui-primary-loading__dot"></span>
</span>
<span role="img" aria-label="加载中" class="weui-primary-loading weui-primary-loading_brand">
<span class="weui-primary-loading__dot"></span>
</span>
<span role="img" aria-label="加载中" class="weui-primary-loading weui-primary-loading_transparent">
<span class="weui-primary-loading__dot"></span>
</span>
<div class="loading_demo_inner">
<i role="img" aria-label="正在加载" class="weui-loading"></i>
<i role="img" aria-label="正在加载" class="weui-mask-loading"></i>
<i role="img" aria-label="正在加载" class="weui-mask-loading" style="color:var(--weui-BRAND);"></i>
<i role="img" aria-label="正在加载" class="weui-mask-loading" style="color:#EDEDED"></i>
</div>
</div>
</div>
</div>
Expand All @@ -3887,7 +3885,7 @@ <h1 class="page__title">Loadmore</h1>
</div>
<div class="page__bd">
<div role="alert" class="weui-loadmore">
<span aria-hidden="true" role="img" aria-label="加载中" class="weui-primary-loading">
<span aria-hidden="true" role="img" aria-label="正在加载" class="weui-primary-loading">
<i class="weui-primary-loading__dot"></i>
</span>
<span class="weui-loadmore__tips">正在加载</span>
Expand Down Expand Up @@ -4294,7 +4292,7 @@ <h1 class="page__title">TopTips</h1>
</script>
<script src="./zepto.min.js"></script>
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<script src="https://res.wx.qq.com/t/wx_fed/cdn_libs/res/weui/1.2.8/weui.min.js"></script>
<script src="https://res.wx.qq.com/t/wx_fed/weui.js/res/1.2.17/weui.min.js"></script>
<script src="./example.js"></script>
<script src="./wah.js"></script>
<script type="text/javascript">
Expand Down
Loading

0 comments on commit 0c59631

Please sign in to comment.