Merge remote-tracking branch 'dec/release/11.0'

# Conflicts: # dist/font/iconfont.eot # dist/font/iconfont.svg # dist/font/iconfont.ttf # dist/font/iconfont.woff # dist/font/iconfont.woff2
2 years ago · c4010fe8e9
6 changed files with 91 additions and 33 deletions
--- a/dist/font/iconfont.eot
+++ b/dist/font/iconfont.eot
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
--- a/dist/font/iconfont.ttf
+++ b/dist/font/iconfont.ttf
--- a/dist/font/iconfont.woff
+++ b/dist/font/iconfont.woff
--- a/dist/font/iconfont.woff2
+++ b/dist/font/iconfont.woff2
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@ -547,7 +547,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                    value: nodes[i].value,
                    text: nodes[i].text,
                    times: 1,
-                    isParent: nodes[i].isParent || nodes[i].getChildrenLength() > 0,
+                    isParent: node.getChildrenLength() > 0,
                    checked: state[0],
                    half: state[1],
                    halfCheck: openState ? false : state[1],