Skip to content

Commit

Permalink
fix(Checkbox): fixed the issue that disabled is invalid when using op…
Browse files Browse the repository at this point in the history 
…tions attribute
  • Loading branch information
@anlyyao
anlyyao committed Jan 7, 2025
1 parent 17c24fe commit 804cb12
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 85 deletions.
4 changes: 2 additions & 2 deletions src/button/__test__/__snapshots__/demo.test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ exports[`Button > Button iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand Down Expand Up @@ -549,7 +549,7 @@ exports[`Button > Button mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand Down
24 changes: 12 additions & 12 deletions src/checkbox/__test__/__snapshots__/demo.test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports[`Checkbox > Checkbox allVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -74,7 +74,7 @@ exports[`Checkbox > Checkbox allVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -111,7 +111,7 @@ exports[`Checkbox > Checkbox allVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -197,7 +197,7 @@ exports[`Checkbox > Checkbox baseVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -234,7 +234,7 @@ exports[`Checkbox > Checkbox baseVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -265,7 +265,7 @@ exports[`Checkbox > Checkbox baseVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -616,7 +616,7 @@ exports[`Checkbox > Checkbox mobileVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -653,7 +653,7 @@ exports[`Checkbox > Checkbox mobileVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -684,7 +684,7 @@ exports[`Checkbox > Checkbox mobileVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -917,7 +917,7 @@ exports[`Checkbox > Checkbox mobileVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -954,7 +954,7 @@ exports[`Checkbox > Checkbox mobileVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down Expand Up @@ -991,7 +991,7 @@ exports[`Checkbox > Checkbox mobileVue demo works fine 1`] = `
<div
class="t-checkbox__description"
>
<!---->
</div>
</div>
<div
Expand Down
20 changes: 2 additions & 18 deletions src/checkbox/checkbox-group.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,31 +99,15 @@ export default defineComponent({
innerValue,
checkAllStatus,
checkedSet,
maxExceeded,
onCheckedChange,
});
return () => {
const checkboxNode = () => {
return (
<span>
{optionList.value.map((item, idx) => (
<checkbox
key={idx}
name={item.name || ''}
label={item.label || item.text || ''}
value={item.value}
check-all={item.checkAll}
block={item.block || true}
checked={item.checked || false}
content={item.content || ''}
content-disabled={item.contentDisabled || false}
icon={item.icon || 'circle'}
indeterminate={item.indeterminate || false}
disabled={item.disabled}
max-content-row={item.maxContentRow || 5}
max-label-row={item.maxLabelRow || 3}
readonly={item.readonly || false}
placement={item.placement || 'left'}
/>
<Checkbox {...item} key={`${item.value || ''}${idx}`} label={item.label || item.text || ''} />
))}
</span>
);
Expand Down
6 changes: 3 additions & 3 deletions src/checkbox/checkbox.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ export default defineComponent({
});

const isDisabled = computed(() => {
if (checkboxGroup?.max.value)
return checkboxGroup.max.value <= checkboxGroup.innerValue.value.length && !isChecked.value;

if (!props.checkAll && !isChecked.value && checkboxGroup?.maxExceeded.value) {
return true;
}
return disabled.value;
});

Expand Down
1 change: 0 additions & 1 deletion src/checkbox/hooks/getOptions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export const getOptions = (props: any, slots: Slots) => {
r = { label: String(item), value: item };
} else {
r = { ...item };
r.disabled = r.disabled === undefined ? props.disabled : r.disabled;
}
return r;
});
Expand Down
4 changes: 0 additions & 4 deletions src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
<path
d="M12 2.25a9.75 9.75 0 000 19.5v-2.44A7.31 7.31 0 1119.31 12h2.44A9.75 9.75 0 0012 2.25z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
<div
Expand Down Expand Up @@ -190,7 +189,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
<path
d="M12 2.25a9.75 9.75 0 000 19.5v-2.44A7.31 7.31 0 1119.31 12h2.44A9.75 9.75 0 0012 2.25z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
<div
Expand Down Expand Up @@ -7137,7 +7135,6 @@ exports[`ConfigProvider > ConfigProvider uploadEnVue demo works fine 1`] = `
<path
d="M12 2.25a9.75 9.75 0 000 19.5v-2.44A7.31 7.31 0 1119.31 12h2.44A9.75 9.75 0 0012 2.25z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
<div
Expand Down Expand Up @@ -7221,7 +7218,6 @@ exports[`ConfigProvider > ConfigProvider uploadEnVue demo works fine 1`] = `
<path
d="M12 2.25a9.75 9.75 0 000 19.5v-2.44A7.31 7.31 0 1119.31 12h2.44A9.75 9.75 0 0012 2.25z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
<div
Expand Down
24 changes: 12 additions & 12 deletions src/drawer/__test__/__snapshots__/demo.test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ exports[`Drawer > Drawer iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -319,7 +319,7 @@ exports[`Drawer > Drawer iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -344,7 +344,7 @@ exports[`Drawer > Drawer iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -369,7 +369,7 @@ exports[`Drawer > Drawer iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -394,7 +394,7 @@ exports[`Drawer > Drawer iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -419,7 +419,7 @@ exports[`Drawer > Drawer iconVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand Down Expand Up @@ -662,7 +662,7 @@ exports[`Drawer > Drawer mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -687,7 +687,7 @@ exports[`Drawer > Drawer mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -712,7 +712,7 @@ exports[`Drawer > Drawer mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -737,7 +737,7 @@ exports[`Drawer > Drawer mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -762,7 +762,7 @@ exports[`Drawer > Drawer mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand All @@ -787,7 +787,7 @@ exports[`Drawer > Drawer mobileVue demo works fine 1`] = `
width="1em"
>
<path
d="M2 2h9v9H2V2zm2 2v5h5V4H4zm13.5 0a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM13 6.5a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM2 13h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm2 2v5h5v-5h-5z"
d="M17.5 3.5a3 3 0 100 6 3 3 0 000-6zm-5 3a5 5 0 1110 0 5 5 0 01-10 0zM2 2h9v9H2V2zm2 2v5h5V4H4zm-2 9h9v9H2v-9zm2 2v5h5v-5H4zm9-2h9v9h-9v-9zm7 2h-5v5h5v-5z"
fill="currentColor"
/>
</svg>
Expand Down
Loading

0 comments on commit 804cb12

Please sign in to comment.