Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(radio-group): dynamic modification of disabled attribute is invalid #2643

Merged
merged 3 commits into from
Mar 14, 2024
Merged

fix(radio-group): dynamic modification of disabled attribute is invalid #2643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02bfb92
fix(radio-group): disabled
catiwang Mar 14, 2024
a18b8a6
fix(radio-group): dynamic modification of disabled attribute is invalid
betavs Mar 14, 2024
ce80287
perf(radio): optimize tap event
betavs Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/radio-group/radio-group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ export default class RadioGroup extends SuperComponent {
options() {
this.initWithOptions();
},
disabled(v) {
if (this.data.options?.length) {
this.initWithOptions();
return;
}
this.getChildren().forEach((item) => {
item.setDisabled(v);
});
},
};

methods = {
Expand All @@ -73,7 +82,7 @@ export default class RadioGroup extends SuperComponent {

// 支持自定义options
initWithOptions() {
const { options, value, keys } = this.data;
const { options, value, keys, disabled } = this.data;
// 数字数组｜字符串数组｜对像数组
if (!options?.length || !Array.isArray(options)) {
this.setData({
Expand All @@ -90,13 +99,15 @@ export default class RadioGroup extends SuperComponent {
label: `${element}`,
value: element,
checked: value === element,
disabled,
});
} else if (typeName === 'object') {
optionsValue.push({
...element,
label: element[keys?.label ?? 'label'],
value: element[keys?.value ?? 'value'],
checked: value === element[keys?.value ?? 'value'],
disabled: element.disabled || disabled,
});
}
});
Expand Down
14 changes: 10 additions & 4 deletions src/radio/radio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,21 @@ export default class Radio extends SuperComponent {
optionLinked: false,
iconVal: [],
_placement: '',
_disabled: false,
};

observers = {
disabled(v) {
this.setData({ _disabled: v });
},
};

methods = {
handleTap(e) {
if (this.data.disabled || this.data.readonly) return;

const { _disabled, readonly, contentDisabled } = this.data;
const { target } = e.currentTarget.dataset;

if (target === 'text' && this.data.contentDisabled) return;
if (_disabled || readonly || (target === 'text' && contentDisabled)) return;

this.doChange();
},
Expand All @@ -96,7 +102,7 @@ export default class Radio extends SuperComponent {

setDisabled(disabled: Boolean) {
this.setData({
disabled: this.data.disabled || disabled,
_disabled: this.data.disabled || disabled,
});
},
};
Expand Down
14 changes: 7 additions & 7 deletions src/radio/radio.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<view
style="{{_._style([style, customStyle])}}"
class="{{_.cls(classPrefix, [_placement, ['block', block]])}} class {{prefix}}-class"
disabled="{{disabled}}"
disabled="{{_disabled}}"
aria-role="radio"
aria-checked="{{checked}}"
aria-label="{{label + content}}"
aria-disabled="{{disabled}}"
aria-disabled="{{_disabled}}"
tabindex="{{tabindex}}"
mut-bind:tap="handleTap"
>
<view
class="{{_.cls(classPrefix + '__icon', [_placement, ['checked', checked], ['disabled', disabled]])}} {{prefix}}-class-icon"
class="{{_.cls(classPrefix + '__icon', [_placement, ['checked', checked], ['disabled', _disabled]])}} {{prefix}}-class-icon"
>
<slot name="icon" wx:if="{{slotIcon}}" />
<view wx:elif="{{customIcon}}" class="{{classPrefix}}__image">
Expand All @@ -26,11 +26,11 @@
/>
<view
wx:if="{{checked && icon == 'dot'}}"
class="{{_.cls(classPrefix + '__icon-' + icon, [['disabled', disabled]])}}"
class="{{_.cls(classPrefix + '__icon-' + icon, [['disabled', _disabled]])}}"
/>
<view
wx:if="{{!checked && (icon == 'circle' || icon == 'dot')}}"
class="{{_.cls(classPrefix + '__icon-circle', [['disabled', disabled]])}}"
class="{{_.cls(classPrefix + '__icon-circle', [['disabled', _disabled]])}}"
/>
<!-- line && unchecked 为空 需要展位元素 -->
<view wx:if="{{!checked && icon == 'line'}}" class="placeholder"></view>
Expand All @@ -39,7 +39,7 @@

<view class="{{classPrefix}}__content" data-target="text" mut-bind:tap="handleTap">
<view
class="{{_.cls(classPrefix + '__title', [['disabled', disabled], ['checked', checked]])}} {{prefix}}-class-label"
class="{{_.cls(classPrefix + '__title', [['disabled', _disabled], ['checked', checked]])}} {{prefix}}-class-label"
style="-webkit-line-clamp:{{maxLabelRow}}"
>
{{label}}
Expand All @@ -48,7 +48,7 @@
</view>

<view
class="{{_.cls(classPrefix + '__description', [['disabled', disabled], ['checked', checked]])}} {{prefix}}-class-content "
class="{{_.cls(classPrefix + '__description', [['disabled', _disabled], ['checked', checked]])}} {{prefix}}-class-content "
style="-webkit-line-clamp:{{maxContentRow}}"
>{{content}}<slot name="content"
/></view>
Expand Down
Loading