From 8d6eb44561cb040c17aeaa115fd08c092fb6a724 Mon Sep 17 00:00:00 2001
From: v_byqbai <1213567900@qq.com>
Date: Tue, 29 Nov 2022 16:57:56 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix(avatar):=20=E6=97=A0=E9=9A=9C=E7=A2=8D?=
 =?UTF-8?q?=E6=9C=97=E8=AF=BB=E6=94=AF=E6=8C=81.=20(#1028)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/avatar/_example/action/index.wxml           | 4 ++--
 src/avatar/_example/character-avatar/index.wxml | 2 +-
 src/avatar/avatar.wxml                          | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/avatar/_example/action/index.wxml b/src/avatar/_example/action/index.wxml
index b1556e1ab..719caff19 100644
--- a/src/avatar/_example/action/index.wxml
+++ b/src/avatar/_example/action/index.wxml
@@ -2,13 +2,13 @@
   <view class="avatar-example">
     <t-avatar-group max="5" cascading="left-up" size="medium">
       <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
-      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered />
+      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered alt="点击添加" />
     </t-avatar-group>
   </view>
   <view class="avatar-example">
     <t-avatar-group max="5" size="medium">
       <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
-      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered />
+      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered alt="点击添加" />
     </t-avatar-group>
   </view>
 </view>
diff --git a/src/avatar/_example/character-avatar/index.wxml b/src/avatar/_example/character-avatar/index.wxml
index f0e042b60..61a158cce 100644
--- a/src/avatar/_example/character-avatar/index.wxml
+++ b/src/avatar/_example/character-avatar/index.wxml
@@ -1,6 +1,6 @@
 <view class="demo-avatar">
   <view class="avatar-example">
-    <t-avatar t-class-content="external-class-content">A</t-avatar>
+    <t-avatar t-class-content="external-class-content" alt="字母A为名称">A</t-avatar>
   </view>
   <view class="avatar-example">
     <t-avatar shape="round" t-class-content="external-class-content">A</t-avatar>
diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index 5635d4840..2fb239a3f 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -18,6 +18,8 @@
     <view
       class="{{this.getAvatarOuterClass(classPrefix, size, shape, bordered)}} {{prefix}}-class-image "
       style="{{this.getAvatarSizePx(size)}}"
+      aria-label="{{ alt || '头像'}}"
+      aria-role="img"
     >
       <t-image
         wx:if="{{image}}"

From 3c543a96e697655f1b6b6e17935415798b199f9f Mon Sep 17 00:00:00 2001
From: v_byqbai <1213567900@qq.com>
Date: Fri, 2 Dec 2022 15:51:18 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix(avatar):=20=E6=94=AF=E6=8C=81=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=97=A0=E9=9A=9C=E7=A2=8D=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?.=20(#1028)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/avatar/_example/action/index.wxml | 4 ++--
 src/avatar/avatar.wxml                | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/avatar/_example/action/index.wxml b/src/avatar/_example/action/index.wxml
index 719caff19..4e3d7c066 100644
--- a/src/avatar/_example/action/index.wxml
+++ b/src/avatar/_example/action/index.wxml
@@ -2,13 +2,13 @@
   <view class="avatar-example">
     <t-avatar-group max="5" cascading="left-up" size="medium">
       <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
-      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered alt="点击添加" />
+      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered aria-role="button" aria-label="点击添加" />
     </t-avatar-group>
   </view>
   <view class="avatar-example">
     <t-avatar-group max="5" size="medium">
       <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
-      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered alt="点击添加" />
+      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered aria-role="button" aria-label="点击添加"/>
     </t-avatar-group>
   </view>
 </view>
diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index 2fb239a3f..f40decaa2 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -18,8 +18,9 @@
     <view
       class="{{this.getAvatarOuterClass(classPrefix, size, shape, bordered)}} {{prefix}}-class-image "
       style="{{this.getAvatarSizePx(size)}}"
-      aria-label="{{ alt || '头像'}}"
-      aria-role="img"
+      aria-label="{{ ariaLabel || '头像'}}"
+      aria-role="{{ ariaRole || 'img'}}"
+      aria-hidden="{{ ariaHidden }}"
     >
       <t-image
         wx:if="{{image}}"

From 34c4bcee40cd615fab4c12b3dad24d1e5b050917 Mon Sep 17 00:00:00 2001
From: v_byqbai <1213567900@qq.com>
Date: Fri, 2 Dec 2022 16:38:50 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix(avatar):=20=E5=A4=B4=E5=83=8Faria-label?=
 =?UTF-8?q?=20=E5=85=9C=E5=BA=95=E9=97=AE=E9=A2=98.=20(#1028)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/avatar/avatar.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index f40decaa2..21b66fb64 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -18,7 +18,7 @@
     <view
       class="{{this.getAvatarOuterClass(classPrefix, size, shape, bordered)}} {{prefix}}-class-image "
       style="{{this.getAvatarSizePx(size)}}"
-      aria-label="{{ ariaLabel || '头像'}}"
+      aria-label="{{ ariaLabel || alt ||'头像'}}"
       aria-role="{{ ariaRole || 'img'}}"
       aria-hidden="{{ ariaHidden }}"
     >

From 40017b5f7c6c22a9da435db76760441699b1d546 Mon Sep 17 00:00:00 2001
From: v_byqbai <1213567900@qq.com>
Date: Fri, 2 Dec 2022 17:28:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix(avatar):=20=E5=A4=B4=E5=83=8F=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98,=20=E6=96=87=E6=A1=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=20=E5=BF=AB=E7=85=A7=E9=97=AE=E9=A2=98=20(#1028)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__test__/__snapshots__/demo.test.js.snap  |   5 +
 src/avatar/_example/action/index.wxml         |   4 +-
 .../_example/character-avatar/index.wxml      |   2 +-
 src/avatar/avatar-group.wxml                  |   1 +
 .../__test__/__snapshots__/demo.test.js.snap  | 214 ++++++++++++++++++
 5 files changed, 223 insertions(+), 3 deletions(-)

diff --git a/src/avatar/__test__/__snapshots__/demo.test.js.snap b/src/avatar/__test__/__snapshots__/demo.test.js.snap
index 65d2805d3..d6f086b1d 100644
--- a/src/avatar/__test__/__snapshots__/demo.test.js.snap
+++ b/src/avatar/__test__/__snapshots__/demo.test.js.snap
@@ -38,6 +38,8 @@ exports[`Avatar Avatar action demo works fine 1`] = `
           image="https://cdn-we-retail.ym.tencent.com/retail-ui/components-exp/avatar/avatar-v2/1.png"
         />
         <t-avatar
+          ariaLabel="添加"
+          ariaRole="button"
           bordered="{{true}}"
           icon="user-add"
           slot="collapseAvatar"
@@ -77,6 +79,8 @@ exports[`Avatar Avatar action demo works fine 1`] = `
           image="https://cdn-we-retail.ym.tencent.com/retail-ui/components-exp/avatar/avatar-v2/1.png"
         />
         <t-avatar
+          ariaLabel="添加"
+          ariaRole="button"
           bordered="{{true}}"
           icon="user-add"
           slot="collapseAvatar"
@@ -144,6 +148,7 @@ exports[`Avatar Avatar character-avatar demo works fine 1`] = `
       class="avatar-example"
     >
       <t-avatar
+        ariaLabel="字符头像"
         tClassContent="external-class-content"
       >
         A
diff --git a/src/avatar/_example/action/index.wxml b/src/avatar/_example/action/index.wxml
index 4e3d7c066..7ca0557d9 100644
--- a/src/avatar/_example/action/index.wxml
+++ b/src/avatar/_example/action/index.wxml
@@ -2,13 +2,13 @@
   <view class="avatar-example">
     <t-avatar-group max="5" cascading="left-up" size="medium">
       <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
-      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered aria-role="button" aria-label="点击添加" />
+      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered aria-role="button" aria-label="添加" />
     </t-avatar-group>
   </view>
   <view class="avatar-example">
     <t-avatar-group max="5" size="medium">
       <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
-      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered aria-role="button" aria-label="点击添加"/>
+      <t-avatar slot="collapseAvatar" icon="user-add" bindtap="onAddTap" bordered aria-role="button" aria-label="添加"/>
     </t-avatar-group>
   </view>
 </view>
diff --git a/src/avatar/_example/character-avatar/index.wxml b/src/avatar/_example/character-avatar/index.wxml
index 61a158cce..6270e4ce7 100644
--- a/src/avatar/_example/character-avatar/index.wxml
+++ b/src/avatar/_example/character-avatar/index.wxml
@@ -1,6 +1,6 @@
 <view class="demo-avatar">
   <view class="avatar-example">
-    <t-avatar t-class-content="external-class-content" alt="字母A为名称">A</t-avatar>
+    <t-avatar t-class-content="external-class-content" aria-label="字符头像">A</t-avatar>
   </view>
   <view class="avatar-example">
     <t-avatar shape="round" t-class-content="external-class-content">A</t-avatar>
diff --git a/src/avatar/avatar-group.wxml b/src/avatar/avatar-group.wxml
index 7d242f171..b4da0e0ca 100644
--- a/src/avatar/avatar-group.wxml
+++ b/src/avatar/avatar-group.wxml
@@ -11,6 +11,7 @@
       t-class-content="{{prefix}}-class-content"
       bordered="{{true}}"
       size="{{size}}"
+      aria-role="none"
       >{{collapseAvatar || '+N'}}</t-avatar
     >
   </view>
diff --git a/src/switch/__test__/__snapshots__/demo.test.js.snap b/src/switch/__test__/__snapshots__/demo.test.js.snap
index ce557ab74..cd51ae8c0 100644
--- a/src/switch/__test__/__snapshots__/demo.test.js.snap
+++ b/src/switch/__test__/__snapshots__/demo.test.js.snap
@@ -13,6 +13,220 @@ exports[`Switch Switch base demo works fine 1`] = `
 </base>
 `;
 
+exports[`Switch Switch color demo works fine 1`] = `
+<color>
+  <wx-view
+    class="custom-color"
+  >
+    <t-cell
+      bordered="{{false}}"
+      title="自定义颜色"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        loading="{{true}}"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      bordered="{{false}}"
+      title="自定义颜色"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        label="{{
+          Array [
+            "关",
+            "开",
+          ]
+        }}"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      bordered="{{false}}"
+      title="自定义颜色"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        icon="{{
+          Array [
+            "close",
+            "check",
+          ]
+        }}"
+        slot="note"
+      />
+    </t-cell>
+  </wx-view>
+</color>
+`;
+
+exports[`Switch Switch label demo works fine 1`] = `
+<wx-label>
+  <t-cell
+    title="默认"
+  >
+    <t-switch
+      label="{{
+        Array [
+          "关",
+          "开",
+        ]
+      }}"
+      slot="note"
+      value="{{true}}"
+      bind:change="handleChange"
+    />
+  </t-cell>
+  <t-cell
+    title="默认关"
+  >
+    <t-switch
+      defaultValue="{{true}}"
+      icon="{{
+        Array [
+          "close",
+          "check",
+        ]
+      }}"
+      slot="note"
+    />
+  </t-cell>
+</wx-label>
+`;
+
+exports[`Switch Switch size demo works fine 1`] = `
+<size>
+  <wx-view
+    class="group"
+  >
+    <t-cell
+      title="大尺寸 32"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        size="large"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      title="中尺寸 28"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      title="小尺寸 24"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        size="small"
+        slot="note"
+      />
+    </t-cell>
+  </wx-view>
+  <wx-view
+    class="group"
+  >
+    <t-cell
+      title="大尺寸 32"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        label="{{
+          Array [
+            "关",
+            "开",
+          ]
+        }}"
+        size="large"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      title="中尺寸 28"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        label="{{
+          Array [
+            "关",
+            "开",
+          ]
+        }}"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      title="小尺寸 24"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        label="{{
+          Array [
+            "关",
+            "开",
+          ]
+        }}"
+        size="small"
+        slot="note"
+      />
+    </t-cell>
+  </wx-view>
+  <wx-view
+    class="group"
+  >
+    <t-cell
+      title="大尺寸 32"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        icon="{{
+          Array [
+            "close",
+            "check",
+          ]
+        }}"
+        size="large"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      title="中尺寸 28"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        icon="{{
+          Array [
+            "close",
+            "check",
+          ]
+        }}"
+        slot="note"
+      />
+    </t-cell>
+    <t-cell
+      title="小尺寸 24"
+    >
+      <t-switch
+        defaultValue="{{true}}"
+        icon="{{
+          Array [
+            "close",
+            "check",
+          ]
+        }}"
+        size="small"
+        slot="note"
+      />
+    </t-cell>
+  </wx-view>
+</size>
+`;
+
 exports[`Switch Switch status demo works fine 1`] = `
 <status>
   <wx-view

From c606a2758b3a7c811cc7aaa98d314db412ed1704 Mon Sep 17 00:00:00 2001
From: byqbai <byq1213@qq.com>
Date: Fri, 2 Dec 2022 17:56:19 +0800
Subject: [PATCH 5/5] test: snap update

---
 .../__test__/__snapshots__/demo.test.js.snap  | 214 ------------------
 1 file changed, 214 deletions(-)

diff --git a/src/switch/__test__/__snapshots__/demo.test.js.snap b/src/switch/__test__/__snapshots__/demo.test.js.snap
index cd51ae8c0..ce557ab74 100644
--- a/src/switch/__test__/__snapshots__/demo.test.js.snap
+++ b/src/switch/__test__/__snapshots__/demo.test.js.snap
@@ -13,220 +13,6 @@ exports[`Switch Switch base demo works fine 1`] = `
 </base>
 `;
 
-exports[`Switch Switch color demo works fine 1`] = `
-<color>
-  <wx-view
-    class="custom-color"
-  >
-    <t-cell
-      bordered="{{false}}"
-      title="自定义颜色"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        loading="{{true}}"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      bordered="{{false}}"
-      title="自定义颜色"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        label="{{
-          Array [
-            "关",
-            "开",
-          ]
-        }}"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      bordered="{{false}}"
-      title="自定义颜色"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        icon="{{
-          Array [
-            "close",
-            "check",
-          ]
-        }}"
-        slot="note"
-      />
-    </t-cell>
-  </wx-view>
-</color>
-`;
-
-exports[`Switch Switch label demo works fine 1`] = `
-<wx-label>
-  <t-cell
-    title="默认"
-  >
-    <t-switch
-      label="{{
-        Array [
-          "关",
-          "开",
-        ]
-      }}"
-      slot="note"
-      value="{{true}}"
-      bind:change="handleChange"
-    />
-  </t-cell>
-  <t-cell
-    title="默认关"
-  >
-    <t-switch
-      defaultValue="{{true}}"
-      icon="{{
-        Array [
-          "close",
-          "check",
-        ]
-      }}"
-      slot="note"
-    />
-  </t-cell>
-</wx-label>
-`;
-
-exports[`Switch Switch size demo works fine 1`] = `
-<size>
-  <wx-view
-    class="group"
-  >
-    <t-cell
-      title="大尺寸 32"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        size="large"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      title="中尺寸 28"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      title="小尺寸 24"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        size="small"
-        slot="note"
-      />
-    </t-cell>
-  </wx-view>
-  <wx-view
-    class="group"
-  >
-    <t-cell
-      title="大尺寸 32"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        label="{{
-          Array [
-            "关",
-            "开",
-          ]
-        }}"
-        size="large"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      title="中尺寸 28"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        label="{{
-          Array [
-            "关",
-            "开",
-          ]
-        }}"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      title="小尺寸 24"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        label="{{
-          Array [
-            "关",
-            "开",
-          ]
-        }}"
-        size="small"
-        slot="note"
-      />
-    </t-cell>
-  </wx-view>
-  <wx-view
-    class="group"
-  >
-    <t-cell
-      title="大尺寸 32"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        icon="{{
-          Array [
-            "close",
-            "check",
-          ]
-        }}"
-        size="large"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      title="中尺寸 28"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        icon="{{
-          Array [
-            "close",
-            "check",
-          ]
-        }}"
-        slot="note"
-      />
-    </t-cell>
-    <t-cell
-      title="小尺寸 24"
-    >
-      <t-switch
-        defaultValue="{{true}}"
-        icon="{{
-          Array [
-            "close",
-            "check",
-          ]
-        }}"
-        size="small"
-        slot="note"
-      />
-    </t-cell>
-  </wx-view>
-</size>
-`;
-
 exports[`Switch Switch status demo works fine 1`] = `
 <status>
   <wx-view