Browse Source

Pull request #1624: BI-64182 树控件trigger中显示值按同一父节点下的子节点升序排列

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

* commit '45265ea8c10999632d62c27e9408aa66e8e63295':
  BI-64182 树控件trigger中显示值按统一父节点下的子节点升序排列
master
windy 4 years ago
parent
commit
1ec43f7446
  1. 1
      changelog.md
  2. 2
      src/case/trigger/trigger.text.js
  3. 2
      src/case/trigger/trigger.text.small.js
  4. 5
      src/widget/multitree/trigger/searcher.multi.tree.js

1
changelog.md

@ -1,5 +1,6 @@
# 更新日志
2.0(2020-12)
- 规范了下拉树trigger中显示值的显示顺序
- bi.editor支持传入autocomplete
- [视觉]editor水印间距统一与文本域水印不可选中
- 修复bi.file的url参数拼接问题

2
src/case/trigger/trigger.text.js

@ -7,7 +7,7 @@
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {

2
src/case/trigger/trigger.text.small.js

@ -6,7 +6,7 @@
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {

5
src/widget/multitree/trigger/searcher.multi.tree.js

@ -150,9 +150,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;

Loading…
Cancel
Save