Browse Source

Pull request #2483: 无JIRA任务 树节点文本换行重影

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '61e33ec3d52f513dc54ab5f5090752db94c41cff':
  无JIRA任务 树节点文本换行重影
es6
windy 3 years ago
parent
commit
736f247b0f
  1. 1
      src/case/ztree/0.treeview.js
  2. 12
      src/component/treevaluechooser/abstract.treevaluechooser.js
  3. 9
      src/component/treevaluechooser/abstract.treevaluechooser.list.js

1
src/case/ztree/0.treeview.js

@ -363,6 +363,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
css: { css: {
display: "inline" display: "inline"
}, },
whiteSpace: "nowrap",
root: true root: true
}, n)); }, n));
var fragment = BI.Widget._renderEngine.createElement("<div>"); var fragment = BI.Widget._renderEngine.createElement("<div>");

12
src/component/treevaluechooser/abstract.treevaluechooser.js

@ -129,7 +129,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
pId: pId, pId: pId,
text: node.text + (llen > 0 ? ("(" + BI.i18nText("BI-Basic_Altogether") + llen + BI.i18nText("BI-Basic_Count") + ")") : ""), text: node.text + (llen > 0 ? ("(" + BI.i18nText("BI-Basic_Altogether") + llen + BI.i18nText("BI-Basic_Count") + ")") : ""),
value: node.value, value: node.value,
open: true open: true,
disabled: node.disabled
}); });
} }
}, },
@ -463,7 +464,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
open: isOpen, open: isOpen,
checked: checked, checked: checked,
halfCheck: half, halfCheck: half,
flag: flag flag: flag,
disabled: node.disabled
}); });
} }
@ -546,7 +548,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
isParent: nodes[i].getChildrenLength() > 0, isParent: nodes[i].getChildrenLength() > 0,
checked: state[0], checked: state[0],
halfCheck: state[1], halfCheck: state[1],
open: o.open open: o.open,
disabled: nodes[i].disabled
}); });
} }
// 如果指定节点全部打开 // 如果指定节点全部打开
@ -584,7 +587,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
isParent: node.getChildrenLength() > 0, isParent: node.getChildrenLength() > 0,
checked: state[0], checked: state[0],
halfCheck: state[1], halfCheck: state[1],
open: self.options.open open: self.options.open,
disabled: node.disabled
}); });
}); });
} }

9
src/component/treevaluechooser/abstract.treevaluechooser.list.js

@ -145,7 +145,8 @@ BI.AbstractListTreeValueChooser = BI.inherit(BI.AbstractTreeValueChooser, {
open: isOpen, open: isOpen,
checked: checked, checked: checked,
halfCheck: false, halfCheck: false,
flag: flag flag: flag,
disabled: node.disabled
}); });
} }
@ -218,7 +219,8 @@ BI.AbstractListTreeValueChooser = BI.inherit(BI.AbstractTreeValueChooser, {
isParent: nodes[i].getChildrenLength() > 0, isParent: nodes[i].getChildrenLength() > 0,
checked: checked, checked: checked,
halfCheck: false, halfCheck: false,
open: o.open open: o.open,
disabled: nodes[i].disabled
}); });
} }
// 如果指定节点全部打开 // 如果指定节点全部打开
@ -240,7 +242,8 @@ BI.AbstractListTreeValueChooser = BI.inherit(BI.AbstractTreeValueChooser, {
isParent: node.getChildrenLength() > 0, isParent: node.getChildrenLength() > 0,
checked: checked, checked: checked,
halfCheck: false, halfCheck: false,
open: o.open open: o.open,
disabled: node.disabled
}); });
}); });
} }

Loading…
Cancel
Save