From cdc817f3d5dd964d92d05bffa347ad6f0d29a1f3 Mon Sep 17 00:00:00 2001 From: Cyrus Date: Mon, 10 Apr 2023 15:07:10 +0800 Subject: [PATCH 001/202] fix(loading): resolve style error (#1873) * fix(loading): resolve style error * test: update unit test --- .../__test__/__snapshots__/index.test.js.snap | 12 ++++++------ .../__virtualHostSnapshot__/index.test.js.snap | 12 ++++++------ src/loading/__test__/index.test.js | 2 +- src/loading/loading.wxml | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/image-viewer/__test__/__snapshots__/index.test.js.snap b/src/image-viewer/__test__/__snapshots__/index.test.js.snap index 66610fc4f..d9a57a892 100644 --- a/src/image-viewer/__test__/__snapshots__/index.test.js.snap +++ b/src/image-viewer/__test__/__snapshots__/index.test.js.snap @@ -18,13 +18,13 @@ exports[`image-viewer :base 1`] = ` > { expect(comp.data.show).not.toBeTruthy(); const $loading = comp.querySelector('.base >>> .t-loading'); - expect($loading.dom.getAttribute('style').includes('display:none')).toBeTruthy(); + expect($loading.dom.style.display).toBe('none'); }); it(`: theme`, () => { diff --git a/src/loading/loading.wxml b/src/loading/loading.wxml index a619f46bd..9d2166153 100644 --- a/src/loading/loading.wxml +++ b/src/loading/loading.wxml @@ -1,12 +1,12 @@ From c460d4a6efd7c6e0abeee402dc4534bb1a6d8917 Mon Sep 17 00:00:00 2001 From: favouredddd <40692560+favouredddd@users.noreply.github.com> Date: Mon, 10 Apr 2023 15:15:13 +0800 Subject: [PATCH 002/202] =?UTF-8?q?feat:=20empty=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=A1=88=E6=B7=BB=E5=8A=A0=E6=8D=A2=E8=A1=8C=20(#1870)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/empty/empty.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/empty/empty.less b/src/empty/empty.less index 8df2ecabf..b4d97fa51 100644 --- a/src/empty/empty.less +++ b/src/empty/empty.less @@ -28,6 +28,7 @@ color: @empty-description-color; // 描述内容颜色 font-size: @empty-description-font-size; // 描述内容字体大小 line-height: @empty-description-line-height; // 描述内容行高 + white-space: pre-wrap; } &__description + &__actions:not(:empty) { From aafa11290aecf46f60a24a0f6443b528567f212d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9C=E5=AD=9C?= <1183048003@qq.com> Date: Mon, 10 Apr 2023 16:08:41 +0800 Subject: [PATCH 003/202] =?UTF-8?q?fix(button):=20=E4=BF=AE=E5=A4=8D[butto?= =?UTF-8?q?n]=20type=3D"submit"=E6=97=B6=EF=BC=8Cdisabled=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88=20(#1878)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(button): 修复[button] type="submit"时,disabled未生效 修复[button] type="submit"时,disabled未生效 * fix(button): 修复[button] type="submit"时,disabled未生效 修复[button] type="submit"时,disabled未生效 * test: update snap --------- Co-authored-by: zjianzzhang --- src/button/button.wxml | 2 +- .../__test__/__virtualHostSnapshot__/index.test.js.snap | 2 +- .../__test__/__virtualHostSnapshot__/demo.test.js.snap | 2 ++ .../__test__/__virtualHostSnapshot__/index.test.js.snap | 4 ---- src/switch/__test__/__virtualHostSnapshot__/demo.test.js.snap | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/button/button.wxml b/src/button/button.wxml index eefa0f3fd..76fb5c23b 100644 --- a/src/button/button.wxml +++ b/src/button/button.wxml @@ -5,7 +5,7 @@ style="{{_._style([style, customStyle])}}" data-custom="{{ customDataset }}" class="class {{className}}" - form-type="{{type}}" + form-type="{{disabled || loading ? '' : type}}" open-type="{{disabled || loading ? '' : openType}}" hover-stop-propagation="{{hoverStopPropagation}}" hover-start-time="{{hoverStartTime}}" diff --git a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap index f643b662c..5e9f6aaf6 100644 --- a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -748,7 +748,7 @@ exports[`calendar :base 1`] = ` bind:getuserinfo="getuserinfo" bind:launchapp="launchapp" bind:opensetting="opensetting" - catch:tap="" + catch:tap="handleTap" > `; diff --git a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap index be5b2624b..b980c3e87 100644 --- a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -412,10 +412,6 @@ exports[`date-time-picker :base 1`] = ` - Date: Mon, 10 Apr 2023 16:24:09 +0800 Subject: [PATCH 004/202] =?UTF-8?q?style(row):=20row=E5=9E=82=E7=9B=B4?= =?UTF-8?q?=E5=B1=85=E4=B8=AD=E6=A0=B7=E5=BC=8F=20(#1866)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加row的flex布局,垂直居中 --- src/row/row.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/row/row.less b/src/row/row.less index c206b7cf7..0c31a451e 100644 --- a/src/row/row.less +++ b/src/row/row.less @@ -1,3 +1,8 @@ +.t-row { + display: flex; + align-items: center; +} + .t-row:after { clear: both; content: ''; From 9288e4cbf7dc0fd058c62bfae74a74a6b93374bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E9=A3=8E?= <455947455@qq.com> Date: Mon, 10 Apr 2023 16:39:01 +0800 Subject: [PATCH 005/202] =?UTF-8?q?fix(progress):=20=E5=AE=89=E5=8D=93?= =?UTF-8?q?=E6=9C=BA=E6=9C=97=E8=AF=BB=E5=BC=82=E5=B8=B8=20&=20=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9C=97=E8=AF=BB=20(#1354)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 安卓机朗读异常 * fix: fix code * fix: 安卓不发音 * fix: fix code * fix: wip 优化中 * fix: 优化 * chore: update snap * fix: fix code * fix: fix code * fix: 错误使用iOS变量 * fix(补充注释): 补充注释 * fix: 优化 * test: update snap * fix: 补充注释 * fix: 优化部分注释, remove code * fix: 优化注释 --------- Co-authored-by: leejimqiu --- .../index.test.js.snap | 50 +- .../index.test.js.snap | 1386 +++++++++-------- .../index.test.js.snap | 80 +- .../index.test.js.snap | 260 ++-- .../index.test.js.snap | 64 +- .../index.test.js.snap | 702 +++++---- .../index.test.js.snap | 74 +- .../index.test.js.snap | 18 +- .../index.test.js.snap | 16 +- .../index.test.js.snap | 216 ++- .../index.test.js.snap | 103 +- .../index.test.js.snap | 332 ++-- .../index.test.js.snap | 142 +- .../index.test.js.snap | 210 +-- .../index.test.js.snap | 116 +- .../index.test.js.snap | 20 +- .../index.test.js.snap | 236 +-- .../__test__/__snapshots__/demo.test.js.snap | 1 + .../__virtualHostSnapshot__/demo.test.js.snap | 1 + src/progress/_example/transition/index.wxml | 2 +- src/progress/progress.ts | 15 + src/progress/progress.wxml | 52 +- src/progress/progress.wxs | 23 +- .../index.test.js.snap | 78 +- .../index.test.js.snap | 216 +-- .../index.test.js.snap | 104 +- .../index.test.js.snap | 30 +- .../index.test.js.snap | 88 +- 28 files changed, 2535 insertions(+), 2100 deletions(-) diff --git a/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap index 5cd6176dc..c292c83f6 100644 --- a/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,35 +2,45 @@ exports[`Avatar & Avatar Groups Avatar Props : style && customStyle 1`] = `
- - + ariaHidden="true" + class="t-badge__content t-class-content" + id="t_badge_0_label" + > + + + + - + - +
`; diff --git a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap index 5e9f6aaf6..750455c3f 100644 --- a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,721 +2,785 @@ exports[`calendar :base 1`] = `
- - + - - 请选择日期 - - - - - - - - 日 - - 一 - - - 二 - - - 三 - - - 四 - - - 五 - - - 六 - - - - - 2022 年 10 月 - - - - - - - - - + class="t-calendar__title" + tabindex="0" + > + + 请选择日期 + + + + + + + + + + 日 + + + 一 + + + 二 + + + 三 + + + 四 + + + 五 + + + 六 + + + + + 2022 年 10 月 + + + + + + + + + + 1 - - - + + + 2 - - - + + + 3 - - - + + + 4 - - - + + + 5 - - - + + + 6 - - - + + + 7 - - - + + + 8 - - - + + + 9 - - - + + + 10 - - - + + + 11 - - - + + + 12 - - - + + + 13 - - - + + + 14 - - - + + + 15 - - - + + + 16 - - - + + + 17 - - - + + + 18 - - - + + + 19 - - - + + + 20 - - - + + + 21 - - - + + + 22 - - - + + + 23 - - - + + + 24 - - - + + + 25 - - - + + + 26 - - - + + + 27 - - - + + + 28 - - - + + + 29 - - - + + + 30 - - - + + + 31 + + + + + + + + + 确定 + + + @@ -759,20 +823,22 @@ exports[`calendar :base 1`] = ` - - - - + + + + +
`; diff --git a/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap index 9bfb5aec0..049933a34 100644 --- a/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,56 +2,66 @@ exports[`cell :base 1`] = `
- - + + + + - - - - + + + + + - +
`; exports[`cell :with group 1`] = `
- +
+ +
`; diff --git a/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap index bbad0465c..3c2af13a0 100644 --- a/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -1,151 +1,183 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`collapse :defaultExpandAll 1`] = ` - - + - - - first - - + + + + + first + + + + + + + + + + + + + - - - - - - - - - + - 内容1 + 内容1 + + - - - - + + - - - second - - + + + + + second + + + + + + + + + + + + + - - - - - - - - - + - 内容2 + 内容2 + + - + - + `; diff --git a/src/count-down/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/count-down/__test__/__virtualHostSnapshot__/index.test.js.snap index c4b88938b..311f3161a 100644 --- a/src/count-down/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/count-down/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,48 +2,58 @@ exports[`countdown :autoStart 1`] = `
- - 00 : 00 : 01 - + + + 00 : 00 : 01 + +
`; exports[`countdown :base 1`] = `
- - 00 : 00 : 01 - + + + 00 : 00 : 01 + +
`; exports[`countdown :base 2`] = `
- - 00 : 00 : 00 - + + + 00 : 00 : 00 + +
`; exports[`countdown :millisecond 1`] = `
- - 00 : 00 : 00 - + + 00 : 00 : 00 + +
`; diff --git a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap index b980c3e87..ed00fef4e 100644 --- a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,442 +2,470 @@ exports[`date-time-picker :base 1`] = `
- - + - - 取消 - - - 选择日期 - - - 确定 - - - - - + class="t-picker__toolbar" + > + + 取消 + + + 选择日期 + + + 确定 + + + + + + + + 2000年 - - - + + + 2001年 - - - + + + 2002年 - - - + + + 2003年 - - - + + + 2004年 - - - + + + 2005年 - - - + + + 2006年 - - - + + + 2007年 - - - + + + 2008年 - - - + + + 2009年 - - - + + + 2010年 - - - + + + 2011年 - - - + + + 2012年 - - - + + + 2013年 - - - + + + 2014年 - - - + + + 2015年 - - - + + + 2016年 - - - + + + 2017年 - - - + + + 2018年 - - - + + + 2019年 - - - + + + 2020年 - - - + + + 2021年 - - - + + + 2022年 - - - + + + 2023年 - - - + + + 2024年 - - - + + + 2025年 - - - + + + 2026年 - - - + + + 2027年 - - - + + + 2028年 - - - + + + 2029年 - - - + + + 2030年 - - - - - - - + + + + + + + + + 1月 - - - + + + 2月 - - - + + + 3月 - - - + + + 4月 - - - + + + 5月 - - - + + + 6月 - - - + + + 7月 - - - + + + 8月 - - - + + + 9月 - - - + + + 10月 - - - + + + 11月 - - - + + + 12月 + + + + + + + + + - - - - - - - - + + + +
`; diff --git a/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap index 0ffdddadb..45a54cb24 100644 --- a/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,41 +2,57 @@ exports[`dialog :base 1`] = `
- - + class="t-popup__content t-class-content" + > + + + + + + + + - - - - - + + +
`; diff --git a/src/divider/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/divider/__test__/__virtualHostSnapshot__/index.test.js.snap index 4fd1b24d2..473ce46af 100644 --- a/src/divider/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/divider/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,17 +2,21 @@ exports[`Divider :base 1`] = `
- + class="t-divider t-divider--horizontal t-divider--center " + style="" + > + + - +
`; diff --git a/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap index 663b4673d..a75d29e0d 100644 --- a/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -2,15 +2,17 @@ exports[`Footer :base 1`] = `
- +
- + + + - +
`; diff --git a/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap index c361b1971..7b844a6a8 100644 --- a/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap +++ b/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap @@ -1,10 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`image-viewer :base 1`] = ` - - - - - + class="class t-class t-loading t-loading--horizontal" + style="width: 44rpx; height: 44rpx; color: inherit" + > + + + + + + + + - +