fix(tree): 解决合并冲突

Tencent · Oct 20, 2023 · 09c65c9 · 09c65c9
2 parents 05cc51f + 24a4bd5
commit 09c65c9
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 81 deletions.
diff --git a/src/_common b/src/_common
diff --git a/src/checkbox/__tests__/__snapshots__/index.test.jsx.snap b/src/checkbox/__tests__/__snapshots__/index.test.jsx.snap
@@ -129,11 +129,11 @@ exports[`Checkbox CheckboxGroup > :props > :checked 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox"
-    tabindex="0"
+    class="t-checkbox t-is-disabled"
   >
     <input
       class="t-checkbox__former"
+      disabled="disabled"
       tabindex="-1"
       type="checkbox"
       value="sz"
@@ -177,11 +177,11 @@ exports[`Checkbox CheckboxGroup > :props > :defaultChecked 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox"
-    tabindex="0"
+    class="t-checkbox t-is-disabled"
   >
     <input
       class="t-checkbox__former"
+      disabled="disabled"
       tabindex="-1"
       type="checkbox"
       value="sz"
@@ -356,11 +356,11 @@ exports[`Checkbox CheckboxGroup > :props > :name 1`] = `
     </span>
   </label>
   <label
-    class="t-checkbox"
-    tabindex="0"
+    class="t-checkbox t-is-disabled"
   >
     <input
       class="t-checkbox__former"
+      disabled="disabled"
       tabindex="-1"
       type="checkbox"
       value="sz"
@@ -384,11 +384,11 @@ exports[`Checkbox CheckboxGroup > :props > :options 1`] = `
   role="group"
 >
   <label
-    class="t-checkbox"
-    tabindex="0"
+    class="t-checkbox t-is-disabled"
   >
     <input
       class="t-checkbox__former"
+      disabled="disabled"
       tabindex="-1"
       type="checkbox"
       value="gz"

diff --git a/src/checkbox/checkbox.tsx b/src/checkbox/checkbox.tsx
@@ -113,12 +113,16 @@ export default defineComponent({
       }
     };
 
+    watch([checkboxStore], () => {
+      if (!checkboxStore.value?.parentExist) {
+        tDisabled.value = props.disabled;
+      }
+    });
+
     watch(
-      [disabled, checkboxStore],
+      [disabled],
       ([val]) => {
-        if (!checkboxStore.value?.parentExist) {
-          tDisabled.value = val;
-        }
+        tDisabled.value = val;
       },
       { immediate: true },
     );
+6 −0		docs/web/api/tabs.en-US.md
+6 −0		docs/web/api/tabs.md
+6 −0		style/web/components/tabs/_index.less
+1 −1		style/web/components/tag-input/_index.less