Merge pull request alibaba-fusion#1375 from myronliu347/master

Add custom cascader indeterminate & checked
siyou · Nov 20, 2019 · 9afba2e · 9afba2e
2 parents 381ffe1 + 4a12b26
commit 9afba2e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/cascader/cascader.jsx b/src/cascader/cascader.jsx
@@ -729,11 +729,13 @@ export default class Cascader extends Component {
 
                     if (multiple) {
                         props.checkable = !(canOnlyCheckLeaf && canExpand);
-                        props.checked = value.indexOf(item.value) > -1;
+                        props.checked =
+                            value.indexOf(item.value) > -1 || !!item.checked;
                         props.indeterminate =
-                            checkStrictly || canOnlyCheckLeaf
+                            (checkStrictly || canOnlyCheckLeaf
                                 ? false
-                                : this.indeterminate.indexOf(item.value) > -1;
+                                : this.indeterminate.indexOf(item.value) >
+                                  -1) || !!item.indeterminate;
                         props.checkboxDisabled = !!item.checkboxDisabled;
                         props.onCheck = this.handleCheck.bind(this, item.value);
                     } else {