Merge remote-tracking branch 'origin' into feat/2.7-sync-develop

Tencent · Jul 19, 2023 · 8e8774b · 8e8774b
2 parents 79fdfc3 + f516ae8
commit 8e8774b
Show file tree

Hide file tree

Showing 40 changed files with 2,874 additions and 1,270 deletions.
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -54,10 +54,11 @@ jobs:
         with:
           ref: ${{ steps.comment.outputs.branch }}
       - name: Commit and push if needed
+        env:
+          BODY: ${{ github.event.comment.body }}
         run: |
           txt=$(cat CHANGELOG.md)
-          body='${{ github.event.comment.body }}'
-          echo "${txt%%##*}${body}${txt##*---}" > CHANGELOG.md
+          echo "${txt%%##*} $BODY ${txt##*---}" > CHANGELOG.md
           git add .
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-vue",
   "purename": "tdesign",
-  "version": "1.4.7-naruto",
+  "version": "1.4.8-naruto",
   "description": "tdesign-vue",
   "title": "tdesign-vue",
   "keywords": [

diff --git a/src/checkbox/__tests__/__snapshots__/index.test.jsx.snap b/src/checkbox/__tests__/__snapshots__/index.test.jsx.snap
@@ -3,9 +3,11 @@
 exports[`Checkbox > :props > :checked 1`] = `
 <label
   class="t-checkbox t-is-checked"
+  tabindex="0"
 >
   <input
     class="t-checkbox__former"
+    tabindex="-1"
     type="checkbox"
     value=""
   />
@@ -21,9 +23,11 @@ exports[`Checkbox > :props > :checked 1`] = `
 exports[`Checkbox > :props > :defaultChecked 1`] = `
 <label
   class="t-checkbox t-is-checked"
+  tabindex="0"
 >
   <input
     class="t-checkbox__former"
+    tabindex="-1"
     type="checkbox"
     value=""
   />
@@ -43,6 +47,7 @@ exports[`Checkbox > :props > :disabled 1`] = `
   <input
     class="t-checkbox__former"
     disabled="disabled"
+    tabindex="-1"
     type="checkbox"
     value=""
   />
@@ -58,10 +63,12 @@ exports[`Checkbox > :props > :disabled 1`] = `
 exports[`Checkbox > :props > :indeterminate 1`] = `
 <label
   class="t-checkbox t-is-indeterminate"
+  tabindex="0"
 >
   <input
     class="t-checkbox__former"
     indeterminate="indeterminate"
+    tabindex="-1"
     type="checkbox"
     value=""
   />
@@ -77,10 +84,12 @@ exports[`Checkbox > :props > :indeterminate 1`] = `
 exports[`Checkbox > :props > :name 1`] = `
 <label
   class="t-checkbox"
+  tabindex="0"
 >
   <input
     class="t-checkbox__former"
     name="checkbox-name"
+    tabindex="-1"
     type="checkbox"
     value=""
   />
@@ -95,15 +104,18 @@ exports[`Checkbox > :props > :name 1`] = `
 
 exports[`Checkbox CheckboxGroup > :props > :checked 1`] = `
 <div
+  aria-label="checkbox-group"
   checked="checked"
   class="t-checkbox-group"
+  role="group"
 >
   <label
     class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="gz"
     />
@@ -117,12 +129,12 @@ exports[`Checkbox CheckboxGroup > :props > :checked 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="sz"
     />
@@ -140,15 +152,18 @@ exports[`Checkbox CheckboxGroup > :props > :checked 1`] = `
 
 exports[`Checkbox CheckboxGroup > :props > :defaultChecked 1`] = `
 <div
+  aria-label="checkbox-group"
   class="t-checkbox-group"
   defaultchecked="sz"
+  role="group"
 >
   <label
     class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="gz"
     />
@@ -162,12 +177,12 @@ exports[`Checkbox CheckboxGroup > :props > :defaultChecked 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="sz"
     />
@@ -185,15 +200,17 @@ exports[`Checkbox CheckboxGroup > :props > :defaultChecked 1`] = `
 
 exports[`Checkbox CheckboxGroup > :props > :disabled 1`] = `
 <div
+  aria-label="checkbox-group"
   class="t-checkbox-group"
+  role="group"
 >
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="bj"
     />
@@ -207,12 +224,12 @@ exports[`Checkbox CheckboxGroup > :props > :disabled 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="gz"
     />
@@ -227,10 +244,11 @@ exports[`Checkbox CheckboxGroup > :props > :disabled 1`] = `
   </label>
   <label
     class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="sz"
     />
@@ -248,15 +266,17 @@ exports[`Checkbox CheckboxGroup > :props > :disabled 1`] = `
 
 exports[`Checkbox CheckboxGroup > :props > :max 1`] = `
 <div
+  aria-label="checkbox-group"
   class="t-checkbox-group"
+  role="group"
 >
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="bj"
     />
@@ -270,11 +290,12 @@ exports[`Checkbox CheckboxGroup > :props > :max 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox t-is-checked"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="gz"
     />
@@ -288,11 +309,12 @@ exports[`Checkbox CheckboxGroup > :props > :max 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox t-is-checked"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="sz"
     />
@@ -310,14 +332,17 @@ exports[`Checkbox CheckboxGroup > :props > :max 1`] = `
 
 exports[`Checkbox CheckboxGroup > :props > :name 1`] = `
 <div
+  aria-label="checkbox-group"
   class="t-checkbox-group"
+  role="group"
 >
   <label
     class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name="checkbox-name"
+      tabindex="-1"
       type="checkbox"
       value="gz"
     />
@@ -331,12 +356,12 @@ exports[`Checkbox CheckboxGroup > :props > :name 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name="checkbox-name"
+      tabindex="-1"
       type="checkbox"
       value="sz"
     />
@@ -354,15 +379,17 @@ exports[`Checkbox CheckboxGroup > :props > :name 1`] = `
 
 exports[`Checkbox CheckboxGroup > :props > :options 1`] = `
 <div
+  aria-label="checkbox-group"
   class="t-checkbox-group"
+  role="group"
 >
   <label
-    class="t-checkbox t-is-disabled"
+    class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      disabled="disabled"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="gz"
     />
@@ -377,10 +404,11 @@ exports[`Checkbox CheckboxGroup > :props > :options 1`] = `
   </label>
   <label
     class="t-checkbox"
+    tabindex="0"
   >
     <input
       class="t-checkbox__former"
-      name=""
+      tabindex="-1"
       type="checkbox"
       value="sz"
     />

diff --git a/src/checkbox/_example/base.vue b/src/checkbox/_example/base.vue
@@ -3,7 +3,7 @@
     <t-checkbox>未选中项</t-checkbox>
     <t-checkbox indeterminate>半选状态</t-checkbox>
     <t-checkbox :checked="true">选中项</t-checkbox>
-    <t-checkbox disabled>未选禁用项</t-checkbox>
+    <t-checkbox disabled :checked="false">未选禁用项</t-checkbox>
     <t-checkbox disabled :checked="true">选中禁用项</t-checkbox>
   </t-space>
 </template>