Skip to content

Commit

Permalink
Merge pull request #869 from Tencent/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@BearJ
BearJ authored Nov 5, 2020
2 parents 2a99a08 + bba6b50 commit b6d6652
Show file tree
Hide file tree
Showing 23 changed files with 492 additions and 55 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.4.1 (2020-11-05)

#### Features
* feat: 升级toast组件的UI
* feat: 新增圆圈loading组件
* feat: 升级button组件的loading UI

#### Bugfixes
* fix: msg组件文本区域新增英文词间折行加破折号的效果


### v2.4.0 (2020-06-17)

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

Large diffs are not rendered by default.

92 changes: 85 additions & 7 deletions dist/example/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ <h1 class="page__title">
</div>
<div class="weui-cell__ft"></div>
</a>
<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="loading" href="javascript:">
<div class="weui-cell__bd">
<p>Loading</p>
</div>
<div class="weui-cell__ft"></div>
</a>
<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="loadmore" href="javascript:">
<div class="weui-cell__bd">
<p>Loadmore</p>
Expand Down Expand Up @@ -396,13 +402,13 @@ <h1 class="page__title">Button</h1>

<div class="button-sp-area">
<a href="javascript:" class="weui-btn weui-btn_primary">页面主操作</a>
<a href="javascript:" class="weui-btn weui-btn_primary weui-btn_loading"><i class="weui-loading"></i>页面主操作</a>
<a href="javascript:" 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:" class="weui-btn weui-btn_disabled weui-btn_primary">页面主操作</a>
<a href="javascript:" class="weui-btn weui-btn_default">页面次要操作</a>
<a href="javascript:" class="weui-btn weui-btn_default weui-btn_loading"><i class="weui-loading"></i>页面次操作</a>
<a href="javascript:" 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:" class="weui-btn weui-btn_disabled weui-btn_default">页面次要操作</a>
<a href="javascript:" class="weui-btn weui-btn_warn">警告类操作</a>
<a href="javascript:" class="weui-btn weui-btn_warn weui-btn_loading"><i class="weui-loading"></i>警告类操作</a>
<a href="javascript:" 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:" class="weui-btn weui-btn_disabled weui-btn_warn">警告类操作</a>
</div>

Expand Down Expand Up @@ -1520,7 +1526,9 @@ <h1 class="page__title">Toast</h1>
</div>
<div class="page__bd page__bd_spacing">
<a href="javascript:" class="weui-btn weui-btn_default" id="showToast">成功提示</a>
<a href="javascript:" class="weui-btn weui-btn_default" id="showWarnToast">失败提示</a>
<a href="javascript:" class="weui-btn weui-btn_default" id="showLoadingToast">加载中提示</a>
<a href="javascript:" class="weui-btn weui-btn_default" id="showTextToast">文字提示</a>
</div>

<!--BEGIN toast-->
Expand All @@ -1531,14 +1539,32 @@ <h1 class="page__title">Toast</h1>
<p class="weui-toast__content">已完成</p>
</div>
</div>
<!--end toast-->

<!--BEGIN toast-->
<div id="warnToast" style="display: none;">
<div class="weui-mask_transparent"></div>
<div class="weui-toast">
<i class="weui-icon-warn weui-icon_toast"></i>
<p class="weui-toast__content">获取链接失败</p>
</div>
</div>

<!-- loading toast -->
<div id="loadingToast" style="display: none;">
<div class="weui-mask_transparent"></div>
<div class="weui-toast">
<i class="weui-loading weui-icon_toast"></i>
<p class="weui-toast__content">数据加载中</p>
<span class="weui-primary-loading weui-primary-loading_transparent weui-icon_toast">
<span class="weui-primary-loading__dot"></span>
</span>
<p class="weui-toast__content">加载中</p>
</div>
</div>

<!-- text toast -->
<div id="textToast" style="display: none;">
<div class="weui-mask_transparent"></div>
<div class="weui-toast weui-toast_text">
<p class="weui-toast__content">文字提示</p>
</div>
</div>
</div>
Expand All @@ -1556,6 +1582,19 @@ <h1 class="page__title">Toast</h1>
});
});

// warn
$(function(){
var $warnToast = $('#warnToast');
$('#showWarnToast').on('click', function(){
if ($warnToast.css('display') != 'none') return;

$warnToast.fadeIn(100);
setTimeout(function () {
$warnToast.fadeOut(100);
}, 2000);
});
});

// loading
$(function(){
var $loadingToast = $('#loadingToast');
Expand All @@ -1568,6 +1607,19 @@ <h1 class="page__title">Toast</h1>
}, 2000);
});
});

// text
$(function(){
var $textToast = $('#textToast');
$('#showTextToast').on('click', function(){
if ($textToast.css('display') != 'none') return;

$textToast.fadeIn(100);
setTimeout(function () {
$textToast.fadeOut(100);
}, 2000);
});
});
</script>

</script>
Expand Down Expand Up @@ -2514,6 +2566,29 @@ <h1 class="page__title">Flex</h1>
</div>
</div>
</div>
</script>
<script type="text/html" id="tpl_loading">
<div class="page">
<div class="page__hd">
<h1 class="page__title">Loading</h1>
<p class="page__desc">加载中</p>
</div>
<div class="page__bd">
<div class="loading_demo">
<i class="weui-loading"></i>
<span class="weui-primary-loading">
<span class="weui-primary-loading__dot"></span>
</span>
<span class="weui-primary-loading weui-primary-loading_brand">
<span class="weui-primary-loading__dot"></span>
</span>
<span class="weui-primary-loading weui-primary-loading_transparent">
<span class="weui-primary-loading__dot"></span>
</span>
</div>
</div>
</div>

</script>
<script type="text/html" id="tpl_loadmore">
<div class="page">
Expand All @@ -2523,7 +2598,9 @@ <h1 class="page__title">Loadmore</h1>
</div>
<div class="page__bd">
<div class="weui-loadmore">
<i class="weui-loading"></i>
<span class="weui-primary-loading">
<i class="weui-primary-loading__dot"></i>
</span>
<span class="weui-loadmore__tips">正在加载</span>
</div>
<div class="weui-loadmore weui-loadmore_line">
Expand All @@ -2534,6 +2611,7 @@ <h1 class="page__title">Loadmore</h1>
</div>
</div>
</div>

</script>
<script type="text/html" id="tpl_uploader">
<div class="page">
Expand Down
Loading

0 comments on commit b6d6652

Please sign in to comment.