From da76ca46b32612b09dd2c33e26108ca30c2120ac Mon Sep 17 00:00:00 2001
From: liuzaijiang <530604689@qq.com>
Date: Wed, 30 Mar 2022 17:32:03 +0800
Subject: [PATCH] fix(comp: checkbox-group): invalid disabled in dataSource

---
 packages/components/checkbox/__tests__/checkboxGroup.spec.ts | 4 +++-
 packages/components/checkbox/src/Checkbox.tsx                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/components/checkbox/__tests__/checkboxGroup.spec.ts b/packages/components/checkbox/__tests__/checkboxGroup.spec.ts
index 748fbe6a2..f1d846f92 100644
--- a/packages/components/checkbox/__tests__/checkboxGroup.spec.ts
+++ b/packages/components/checkbox/__tests__/checkboxGroup.spec.ts
@@ -65,12 +65,14 @@ describe('CheckboxGroup', () => {
   test('dataSource work', async () => {
     let dataSource = [
       { label: 'option1', value: 'option1' },
-      { label: 'option2', value: 'option2' },
+      { label: 'option2', value: 'option2', disabled: true },
     ]
     const wrapper = CheckboxGroupMount({ props: { dataSource } })
 
     expect(wrapper.findAll('.ix-checkbox').length).toBe(2)
 
+    expect(wrapper.findAll('.ix-checkbox-disabled').length).toBe(1)
+
     dataSource = [
       { label: 'option1', value: 'option1' },
       { label: 'option2', value: 'option2' },
diff --git a/packages/components/checkbox/src/Checkbox.tsx b/packages/components/checkbox/src/Checkbox.tsx
index 4ba2a67bf..7c681ef79 100644
--- a/packages/components/checkbox/src/Checkbox.tsx
+++ b/packages/components/checkbox/src/Checkbox.tsx
@@ -106,7 +106,7 @@ const useCheckbox = (props: CheckboxProps, checkboxGroup: CheckboxGroupContext |
   if (checkboxGroup) {
     const { props: groupProps, accessor } = checkboxGroup
     isChecked = computed(() => (accessor.valueRef.value ?? []).includes(props.value ?? props.trueValue))
-    isDisabled = computed(() => accessor.disabled.value ?? !!props.disabled)
+    isDisabled = computed(() => props.disabled ?? accessor.disabled.value)
 
     handleBlur = (evt: FocusEvent) => {
       isFocused.value = false