Skip to content

Commit 3c70323

Browse files
uxsiuxsi
committed
feat: v2.6.21
1 parent 50a521d commit 3c70323

File tree

13 files changed

+137
-49
lines changed

13 files changed

+137
-49
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
### v2.6.21 (2024-12-23)
2+
3+
#### Features
4+
* feat: 新增weui-toast__wrp结构用于适配toast宽度动态变化
5+
6+
#### Bugfixes
7+
* fix: 修复toast组件超长英文溢出问题
8+
* fix: 修复表单悬浮按钮、半屏弹窗悬浮按钮、验证码按钮、搜索按钮等未适配button组件新规范的问题
9+
10+
11+
112
### v2.6.20 (2024-12-23)
213

314
#### Features

‎dist/example/index.html

+28-18
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ <h1 class="page__title">Button</h1>
538538
</label>
539539
</div>
540540
<div class="weui-bottom-fixed-opr" id="js_opr">
541-
<a href="javascript:;" role="button" class="weui-btn weui-btn_primary" id="js_btn">阅读并同意</a>
541+
<a href="javascript:;" role="button" class="weui-btn weui-btn_primary" id="js_btn"><span class="weui-btn__inner">阅读并同意</span></a>
542542
<a href="javascript:;" role="button" class="weui-btn weui-btn_default">取消</a>
543543
</div>
544544
</div>
@@ -1740,7 +1740,7 @@ <h2 class="weui-form__title">底部悬浮表单</h2>
17401740
</span>
17411741
</label>
17421742
</div>
1743-
<div class="weui-form__opr-area">
1743+
<div class="weui-form__opr-area weui-bottom-fixed-opr">
17441744
<button class="weui-btn weui-btn_primary" type="button" id="showTooltips">确定</button>
17451745
</div>
17461746
</div>
@@ -2466,46 +2466,56 @@ <h1 class="page__title">Toast</h1>
24662466
<!--BEGIN toast-->
24672467
<div role="alert" id="toast" style="display: none;">
24682468
<div class="weui-mask_transparent"></div>
2469-
<div class="weui-toast">
2470-
<i class="weui-icon-success-no-circle weui-icon_toast"></i>
2471-
<p class="weui-toast__content">已完成</p>
2469+
<div class="weui-toast__wrp">
2470+
<div class="weui-toast">
2471+
<i class="weui-icon-success-no-circle weui-icon_toast"></i>
2472+
<p class="weui-toast__content">已完成</p>
2473+
</div>
24722474
</div>
24732475
</div>
24742476

24752477
<!--BEGIN toast-->
24762478
<div role="alert" id="textMoreToast" style="display: none;">
24772479
<div class="weui-mask_transparent"></div>
2478-
<div class="weui-toast weui-toast_text-more">
2479-
<i class="weui-icon-warn weui-icon_toast"></i>
2480-
<p class="weui-toast__content">此处为长文案提示详情</p>
2480+
<div class="weui-toast__wrp">
2481+
<div class="weui-toast weui-toast_text-more">
2482+
<i class="weui-icon-warn weui-icon_toast"></i>
2483+
<p class="weui-toast__content">长文案提示详情，长文案提示详情，长文案提示详情</p>
2484+
</div>
24812485
</div>
24822486
</div>
24832487

24842488
<!--BEGIN toast-->
24852489
<div role="alert" id="warnToast" style="display: none;">
24862490
<div class="weui-mask_transparent"></div>
2487-
<div class="weui-toast">
2488-
<i class="weui-icon-warn weui-icon_toast"></i>
2489-
<p class="weui-toast__content">获取链接失败</p>
2491+
<div class="weui-toast__wrp">
2492+
<div class="weui-toast">
2493+
<i class="weui-icon-warn weui-icon_toast"></i>
2494+
<p class="weui-toast__content">获取链接失败</p>
2495+
</div>
24902496
</div>
24912497
</div>
24922498

24932499
<!-- loading toast -->
24942500
<div role="alert" id="loadingToast" style="display: none;">
24952501
<div class="weui-mask_transparent"></div>
2496-
<div class="weui-toast">
2497-
<span class="weui-primary-loading weui-icon_toast">
2498-
<span class="weui-primary-loading__dot"></span>
2499-
</span>
2500-
<p class="weui-toast__content">正在加载</p>
2502+
<div class="weui-toast__wrp">
2503+
<div class="weui-toast">
2504+
<span class="weui-primary-loading weui-icon_toast">
2505+
<span class="weui-primary-loading__dot"></span>
2506+
</span>
2507+
<p class="weui-toast__content">正在加载</p>
2508+
</div>
25012509
</div>
25022510
</div>
25032511

25042512
<!-- text toast -->
25052513
<div role="alert" id="textToast" style="display: none;">
25062514
<div class="weui-mask_transparent"></div>
2507-
<div class="weui-toast weui-toast_text">
2508-
<p class="weui-toast__content">文字提示</p>
2515+
<div class="weui-toast__wrp">
2516+
<div class="weui-toast weui-toast_text">
2517+
<p class="weui-toast__content">文字提示</p>
2518+
</div>
25092519
</div>
25102520
</div>
25112521
</div>

‎dist/style/weui.css

+39-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/style/weui.min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "weui",
3-
"version": "2.6.20",
3+
"version": "2.6.21",
44
"description": "A UI library by WeChat official design team, includes the most useful widgets/modules in mobile web applications.",
55
"keywords": [
66
"weui",

‎src/example/button/button_bottom_fixed.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</label>
1212
</div>
1313
<div class="weui-bottom-fixed-opr" id="js_opr">
14-
<a href="javascript:;" role="button" class="weui-btn weui-btn_primary" id="js_btn">阅读并同意</a>
14+
<a href="javascript:;" role="button" class="weui-btn weui-btn_primary" id="js_btn"><span class="weui-btn__inner">阅读并同意</span></a>
1515
<a href="javascript:;" role="button" class="weui-btn weui-btn_default">取消</a>
1616
</div>
1717
</div>

‎src/example/form/form_bottom_fixed.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h2 class="weui-form__title">底部悬浮表单</h2>
8686
</span>
8787
</label>
8888
</div>
89-
<div class="weui-form__opr-area">
89+
<div class="weui-form__opr-area weui-bottom-fixed-opr">
9090
<button class="weui-btn weui-btn_primary" type="button" id="showTooltips">确定</button>
9191
</div>
9292
</div>

‎src/example/toast/toast.html

+26-16
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,56 @@ <h1 class="page__title">Toast</h1>
1414
<!--BEGIN toast-->
1515
<div role="alert" id="toast" style="display: none;">
1616
<div class="weui-mask_transparent"></div>
17-
<div class="weui-toast">
18-
<i class="weui-icon-success-no-circle weui-icon_toast"></i>
19-
<p class="weui-toast__content">已完成</p>
17+
<div class="weui-toast__wrp">
18+
<div class="weui-toast">
19+
<i class="weui-icon-success-no-circle weui-icon_toast"></i>
20+
<p class="weui-toast__content">已完成</p>
21+
</div>
2022
</div>
2123
</div>
2224

2325
<!--BEGIN toast-->
2426
<div role="alert" id="textMoreToast" style="display: none;">
2527
<div class="weui-mask_transparent"></div>
26-
<div class="weui-toast weui-toast_text-more">
27-
<i class="weui-icon-warn weui-icon_toast"></i>
28-
<p class="weui-toast__content">此处为长文案提示详情</p>
28+
<div class="weui-toast__wrp">
29+
<div class="weui-toast weui-toast_text-more">
30+
<i class="weui-icon-warn weui-icon_toast"></i>
31+
<p class="weui-toast__content">长文案提示详情，长文案提示详情，长文案提示详情</p>
32+
</div>
2933
</div>
3034
</div>
3135

3236
<!--BEGIN toast-->
3337
<div role="alert" id="warnToast" style="display: none;">
3438
<div class="weui-mask_transparent"></div>
35-
<div class="weui-toast">
36-
<i class="weui-icon-warn weui-icon_toast"></i>
37-
<p class="weui-toast__content">获取链接失败</p>
39+
<div class="weui-toast__wrp">
40+
<div class="weui-toast">
41+
<i class="weui-icon-warn weui-icon_toast"></i>
42+
<p class="weui-toast__content">获取链接失败</p>
43+
</div>
3844
</div>
3945
</div>
4046

4147
<!-- loading toast -->
4248
<div role="alert" id="loadingToast" style="display: none;">
4349
<div class="weui-mask_transparent"></div>
44-
<div class="weui-toast">
45-
<span class="weui-primary-loading weui-icon_toast">
46-
<span class="weui-primary-loading__dot"></span>
47-
</span>
48-
<p class="weui-toast__content">正在加载</p>
50+
<div class="weui-toast__wrp">
51+
<div class="weui-toast">
52+
<span class="weui-primary-loading weui-icon_toast">
53+
<span class="weui-primary-loading__dot"></span>
54+
</span>
55+
<p class="weui-toast__content">正在加载</p>
56+
</div>
4957
</div>
5058
</div>
5159

5260
<!-- text toast -->
5361
<div role="alert" id="textToast" style="display: none;">
5462
<div class="weui-mask_transparent"></div>
55-
<div class="weui-toast weui-toast_text">
56-
<p class="weui-toast__content">文字提示</p>
63+
<div class="weui-toast__wrp">
64+
<div class="weui-toast weui-toast_text">
65+
<p class="weui-toast__content">文字提示</p>
66+
</div>
5767
</div>
5868
</div>
5969
</div>

‎src/style/base/mixin/btnWrapLayout.less

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
.weui-btn:nth-last-child(n+2) + .weui-btn {
2929
margin: 0 8px;
3030
width: 136px;
31+
min-width: 0;
3132
&:first-child {
3233
margin-left: 0;
3334
}

‎src/style/widget/weui-button/weui-button.less

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ input {
3838
&.weui-btn_inline,
3939
&.weui-btn_mini {
4040
width: auto;
41+
min-width: 0;
4142
}
4243
}
4344

@@ -49,7 +50,7 @@ input {
4950

5051
.weui-btn_mini {
5152
display: inline-block;
52-
width: auto;
53+
min-width: 0;
5354
line-height: ~"calc((32 - 12) / 14)";
5455
padding: 6px 12px;
5556
font-size: 14px;
@@ -58,7 +59,7 @@ input {
5859

5960
.weui-btn_xmini {
6061
display: inline-block;
61-
width: auto;
62+
min-width: 0;
6263
padding: 4px 12px;
6364
line-height: ~"calc((28 - 8) / 14)";
6465
font-size: 14px;

‎src/style/widget/weui-cell/weui-cells__group.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ body {
181181
font-size: 16px;
182182
padding: 0 12px;
183183
height: auto;
184-
width: auto;
184+
min-width: 0;
185185
line-height: 2;
186186
border-radius: 6px;
187187
color: @weuiBtnDefaultFontColor;

‎src/style/widget/weui-searchbar/weui-searchbar.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ input[type="search"]::-webkit-search-results-decoration {
237237
.weui-search-bar__search-btn {
238238
display: flex;
239239
align-items: center;
240-
width: auto;
240+
min-width: 0;
241241
padding: 8px 12px;
242242
font-size: 15px;
243243
font-weight: 400;

‎src/style/widget/weui-tips/weui-toast.less

+22
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,27 @@
3737
box-sizing: border-box;
3838
line-height: 1.4;
3939
}
40+
.weui-toast__wrp {
41+
z-index: 5500;
42+
position: fixed;
43+
top: 0;
44+
left: 0;
45+
right: 0;
46+
bottom: 0;
47+
display: flex;
48+
align-items: center;
49+
justify-content: center;
50+
51+
.weui-toast {
52+
position: static;
53+
transform: none;
54+
margin-top: -10%;
55+
}
56+
}
4057
.weui-toast_text {
4158
padding: 12px 20px;
59+
min-width: 0;
60+
min-height: 0;
4261
}
4362
.weui-icon_toast {
4463
// 重置weui-icon权重
@@ -49,6 +68,7 @@
4968

5069
display: block;
5170
margin-bottom: 16px;
71+
flex-shrink: 0;
5272
&.weui-icon-success-no-circle {
5373
color: rgba(255, 255, 255, 0.9);
5474
}
@@ -84,6 +104,8 @@
84104
.weui-toast__content {
85105
font-size: 14px;
86106
.hyphens;
107+
108+
max-width: 100%;
87109
}
88110

89111
// 多行文本场景

0 commit comments

Comments
 (0)