Browse Source

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
es6
Treecat 2 years ago
parent
commit
c4010fe8e9
  1. BIN
      dist/font/iconfont.eot
  2. 122
      dist/font/iconfont.svg
  3. BIN
      dist/font/iconfont.ttf
  4. BIN
      dist/font/iconfont.woff
  5. BIN
      dist/font/iconfont.woff2
  6. 2
      src/component/treevaluechooser/abstract.treevaluechooser.js

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

122
dist/font/iconfont.svg vendored

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 728 KiB

After

Width:  |  Height:  |  Size: 764 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

2
src/component/treevaluechooser/abstract.treevaluechooser.js

@ -547,7 +547,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
value: nodes[i].value, value: nodes[i].value,
text: nodes[i].text, text: nodes[i].text,
times: 1, times: 1,
isParent: nodes[i].isParent || nodes[i].getChildrenLength() > 0, isParent: node.getChildrenLength() > 0,
checked: state[0], checked: state[0],
half: state[1], half: state[1],
halfCheck: openState ? false : state[1], halfCheck: openState ? false : state[1],

Loading…
Cancel
Save