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

Jump to bottom

fix(TreeSelect): calculate all checked value only when treeCheckedStrategy=all, close#3936 #3938

Merged
merged 5 commits into from
Jun 10, 2022
Merged

fix(TreeSelect): calculate all checked value only when treeCheckedStrategy=all, close#3936 #3938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0903e96
fix(TreeSelect): calculate all checked value only when treeCheckedStr…
lakerswgq Jun 7, 2022
869f863
fix(TreeSelect): calculate all checked value only when treeCheckedStr…
lakerswgq Jun 7, 2022
d5c25bb
Merge branch 'hotifx/tree-select-20220607' of github.com:alibaba-fusi…
lakerswgq Jun 9, 2022
9ed19af
fix(TreeSelect): fix treeCheckedStrategy issue
lakerswgq Jun 9, 2022
f780d30
test(*): remove only on test case
lakerswgq Jun 9, 2022
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
6 changes: 5 additions & 1 deletion src/tree-select/tree-select.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,11 @@ class TreeSelect extends Component {
const nonExistentValueKeys = this.getNonExistentValueKeys();

let keys = this.getKeysByValue(value);
keys = getAllCheckedKeys(keys, this.state._k2n, this.state._p2n);

if (treeCheckedStrategy !== 'child') {
// there's no need to calculate all checked value when treeCheckedStrategy=child, close #3936
keys = getAllCheckedKeys(keys, this.state._k2n, this.state._p2n);
}

switch (treeCheckedStrategy) {
case 'parent':
Expand Down
2 changes: 1 addition & 1 deletion test/time-picker2/index-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ describe('TimePicker2', () => {

assert.deepEqual(getStrValue(wrapper), ['11:12:13', '12:00:00'])
})
it.only('should render with value controlled', () => {
it('should render with value controlled', () => {
wrapper = mount(<TimeRangePicker value={[defaultValue, defaultValue.add(1, 'hours')]} />);

assert.deepEqual(getStrValue(wrapper), ['11:12:13', '12:12:13'])
Expand Down