Skip to content

Commit e654713

Browse files
committed
Merge branch 'EmiyaYang-master'
2 parents 1a61d1f + 4c17169 commit e654713

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

components/checkbox/Checkbox.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ export default {
9595
checkboxProps.props.name = checkboxGroup.name;
9696
checkboxProps.props.checked = checkboxGroup.sValue.indexOf(props.value) !== -1;
9797
checkboxProps.props.disabled = props.disabled || checkboxGroup.disabled;
98+
checkboxProps.props.indeterminate = indeterminate;
9899
} else {
99100
checkboxProps.on.change = this.handleChange;
100101
}

components/checkbox/Group.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ export default {
9999
prefixCls={prefixCls}
100100
key={option.value.toString()}
101101
disabled={'disabled' in option ? option.disabled : props.disabled}
102+
indeterminate={option.indeterminate}
102103
value={option.value}
103104
checked={state.sValue.indexOf(option.value) !== -1}
104105
onChange={option.onChange || noop}

0 commit comments

Comments
 (0)