Browse Source

Merge pull request #265 in FUI/fineui from ~WINDY/fui:master to master

* commit '08941c483de407fc8ce13f4fa35ee057390d1fb2':
  update
  lodash替换pluck && downlistcombo的getValue问题
es6
guy 7 years ago
parent
commit
db1f0487bf
  1. 2
      demo/js/core/abstract/combination/demo.combo.js
  2. 10
      demo/js/widget/downlist/demo.downlist.js
  3. 65
      dist/bundle.js
  4. 22
      dist/bundle.min.js
  5. 12
      dist/demo.js
  6. 65
      dist/fineui.js
  7. 20
      dist/fineui.min.js
  8. 65
      dist/widget.js
  9. 41
      src/widget/downlist/popup.downlist.js
  10. 4
      src/widget/multiselect/multiselect..insert.combo.js
  11. 4
      src/widget/multiselect/multiselect.combo.js
  12. 4
      src/widget/multiselectlist/multiselectlist.insert.js
  13. 4
      src/widget/multiselectlist/multiselectlist.js
  14. 4
      src/widget/singleselect/singleselect.combo.js
  15. 4
      src/widget/singleselectaddsearch/singleselect.combo.js

2
demo/js/core/abstract/combination/demo.combo.js

@ -197,7 +197,7 @@ Demo.Func = BI.inherit(BI.Widget, {
text: "全选", text: "全选",
onCheck: function (v) { onCheck: function (v) {
if (v) { if (v) {
multiCombo.setValue(BI.pluck(BI.deepClone(self.years), "value")); multiCombo.setValue(BI.map(BI.deepClone(self.years), "value"));
} else { } else {
multiCombo.setValue([]); multiCombo.setValue([]);
} }

10
demo/js/widget/downlist/demo.downlist.js

@ -57,7 +57,7 @@ Demo.Downlist = BI.inherit(BI.Widget, {
value: [{"childValue":22,"value":11},{"value":18},{"value":20}], value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
height: 30, height: 30,
width: 100, width: 100,
items: [ items: [[{text: "temp", value: 1111111}],
[{ [{
el: { el: {
text: "column 1111", text: "column 1111",
@ -80,17 +80,17 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 2", text: "column 2",
iconCls1: "chart-type-e-font", iconCls1: "chart-type-e-font",
cls: "dot-e-font", cls: "dot-e-font",
value: 11 value: 12
}, },
children: [{ children: [{
type: "bi.icon_text_item", type: "bi.icon_text_item",
cls: "dot-e-font", cls: "dot-e-font",
height: 25, height: 25,
text: "column 2.1", text: "column 2.1",
value: 21 value: 11
}, { }, {
text: "column 2.2", text: "column 2.2",
value: 22, value: 12,
cls: "dot-e-font" cls: "dot-e-font"
}] }]
}], }],
@ -139,7 +139,7 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 15", text: "column 15",
cls: "dot-e-font", cls: "dot-e-font",
value: 23, value: 25,
bubble: "hahahaha" bubble: "hahahaha"
} }
] ]

65
dist/bundle.js vendored

@ -86687,25 +86687,38 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
var value = []; var value = [];
BI.each(o.items, function (idx, itemGroup) { BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) { BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){ if(BI.isNotNull(item.children)) {
var childValues = BI.pluck(item.children, "value"); var childValues = BI.map(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){ var v = joinValue(childValues, valueGetter(idx));
value.push(valueGetter(idx)); if(BI.isNotEmptyString(v)) {
value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)){ if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)); value.push(valueGetter(idx)[0]);
} }
} }
}) });
}); });
return value; return value;
function valueGetter(index) { function joinValue (sources, targets) {
var value = "";
BI.some(sources, function (idx, s) {
return BI.some(targets, function (id, t) {
if(s === t) {
value = s;
return true;
}
});
});
return value;
}
function valueGetter (index) {
switch (o.chooseType) { switch (o.chooseType) {
case BI.Selection.Single: case BI.Selection.Single:
return values[0]; return values[0];
break;
case BI.Selection.Multi: case BI.Selection.Multi:
return values[index]; return values[index];
default: default:
@ -86733,9 +86746,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
this.popup.setValue(this._digest(valueItem)); this.popup.setValue(this._digest(valueItem));
}, },
_getValue: function () {
var v = [];
BI.each(this.popup.getAllButtons(), function (i, item) {
i % 2 === 0 && v.push(item.getValue());
});
return v;
},
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this._checkValues(this.popup.getValue()); var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) { BI.each(values, function (i, value) {
var valueItem = {}; var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
@ -91719,7 +91740,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -91742,7 +91763,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -92076,7 +92097,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -92099,7 +92120,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -93529,7 +93550,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -93554,7 +93575,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -93843,7 +93864,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -93868,7 +93889,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA, type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -98360,7 +98381,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -98383,7 +98404,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -99677,7 +99698,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -99700,7 +99721,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

22
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/demo.js vendored

@ -6142,7 +6142,7 @@ BI.shortcut("demo.combo_group", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
text: "全选", text: "全选",
onCheck: function (v) { onCheck: function (v) {
if (v) { if (v) {
multiCombo.setValue(BI.pluck(BI.deepClone(self.years), "value")); multiCombo.setValue(BI.map(BI.deepClone(self.years), "value"));
} else { } else {
multiCombo.setValue([]); multiCombo.setValue([]);
} }
@ -12093,7 +12093,7 @@ Demo.Downlist = BI.inherit(BI.Widget, {
value: [{"childValue":22,"value":11},{"value":18},{"value":20}], value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
height: 30, height: 30,
width: 100, width: 100,
items: [ items: [[{text: "temp", value: 1111111}],
[{ [{
el: { el: {
text: "column 1111", text: "column 1111",
@ -12116,17 +12116,17 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 2", text: "column 2",
iconCls1: "chart-type-e-font", iconCls1: "chart-type-e-font",
cls: "dot-e-font", cls: "dot-e-font",
value: 11 value: 12
}, },
children: [{ children: [{
type: "bi.icon_text_item", type: "bi.icon_text_item",
cls: "dot-e-font", cls: "dot-e-font",
height: 25, height: 25,
text: "column 2.1", text: "column 2.1",
value: 21 value: 11
}, { }, {
text: "column 2.2", text: "column 2.2",
value: 22, value: 12,
cls: "dot-e-font" cls: "dot-e-font"
}] }]
}], }],
@ -12175,7 +12175,7 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 15", text: "column 15",
cls: "dot-e-font", cls: "dot-e-font",
value: 23, value: 25,
bubble: "hahahaha" bubble: "hahahaha"
} }
] ]

65
dist/fineui.js vendored

@ -88451,25 +88451,38 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
var value = []; var value = [];
BI.each(o.items, function (idx, itemGroup) { BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) { BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){ if(BI.isNotNull(item.children)) {
var childValues = BI.pluck(item.children, "value"); var childValues = BI.map(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){ var v = joinValue(childValues, valueGetter(idx));
value.push(valueGetter(idx)); if(BI.isNotEmptyString(v)) {
value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)){ if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)); value.push(valueGetter(idx)[0]);
} }
} }
}) });
}); });
return value; return value;
function valueGetter(index) { function joinValue (sources, targets) {
var value = "";
BI.some(sources, function (idx, s) {
return BI.some(targets, function (id, t) {
if(s === t) {
value = s;
return true;
}
});
});
return value;
}
function valueGetter (index) {
switch (o.chooseType) { switch (o.chooseType) {
case BI.Selection.Single: case BI.Selection.Single:
return values[0]; return values[0];
break;
case BI.Selection.Multi: case BI.Selection.Multi:
return values[index]; return values[index];
default: default:
@ -88497,9 +88510,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
this.popup.setValue(this._digest(valueItem)); this.popup.setValue(this._digest(valueItem));
}, },
_getValue: function () {
var v = [];
BI.each(this.popup.getAllButtons(), function (i, item) {
i % 2 === 0 && v.push(item.getValue());
});
return v;
},
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this._checkValues(this.popup.getValue()); var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) { BI.each(values, function (i, value) {
var valueItem = {}; var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
@ -93483,7 +93504,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -93506,7 +93527,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -93840,7 +93861,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -93863,7 +93884,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -95293,7 +95314,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -95318,7 +95339,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -95607,7 +95628,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -95632,7 +95653,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA, type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -100124,7 +100145,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -100147,7 +100168,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -101441,7 +101462,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -101464,7 +101485,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

20
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

65
dist/widget.js vendored

@ -2352,25 +2352,38 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
var value = []; var value = [];
BI.each(o.items, function (idx, itemGroup) { BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) { BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){ if(BI.isNotNull(item.children)) {
var childValues = BI.pluck(item.children, "value"); var childValues = BI.map(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){ var v = joinValue(childValues, valueGetter(idx));
value.push(valueGetter(idx)); if(BI.isNotEmptyString(v)) {
value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)){ if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)); value.push(valueGetter(idx)[0]);
} }
} }
}) });
}); });
return value; return value;
function valueGetter(index) { function joinValue (sources, targets) {
var value = "";
BI.some(sources, function (idx, s) {
return BI.some(targets, function (id, t) {
if(s === t) {
value = s;
return true;
}
});
});
return value;
}
function valueGetter (index) {
switch (o.chooseType) { switch (o.chooseType) {
case BI.Selection.Single: case BI.Selection.Single:
return values[0]; return values[0];
break;
case BI.Selection.Multi: case BI.Selection.Multi:
return values[index]; return values[index];
default: default:
@ -2398,9 +2411,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
this.popup.setValue(this._digest(valueItem)); this.popup.setValue(this._digest(valueItem));
}, },
_getValue: function () {
var v = [];
BI.each(this.popup.getAllButtons(), function (i, item) {
i % 2 === 0 && v.push(item.getValue());
});
return v;
},
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this._checkValues(this.popup.getValue()); var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) { BI.each(values, function (i, value) {
var valueItem = {}; var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
@ -7384,7 +7405,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -7407,7 +7428,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -7741,7 +7762,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -7764,7 +7785,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -9194,7 +9215,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -9219,7 +9240,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -9508,7 +9529,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -9533,7 +9554,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA, type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -14025,7 +14046,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -14048,7 +14069,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);
@ -15342,7 +15363,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -15365,7 +15386,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

41
src/widget/downlist/popup.downlist.js

@ -198,25 +198,38 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
var value = []; var value = [];
BI.each(o.items, function (idx, itemGroup) { BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) { BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){ if(BI.isNotNull(item.children)) {
var childValues = BI.pluck(item.children, "value"); var childValues = BI.map(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){ var v = joinValue(childValues, valueGetter(idx));
value.push(valueGetter(idx)); if(BI.isNotEmptyString(v)) {
value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)){ if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)); value.push(valueGetter(idx)[0]);
} }
} }
}) });
}); });
return value; return value;
function valueGetter(index) { function joinValue (sources, targets) {
var value = "";
BI.some(sources, function (idx, s) {
return BI.some(targets, function (id, t) {
if(s === t) {
value = s;
return true;
}
});
});
return value;
}
function valueGetter (index) {
switch (o.chooseType) { switch (o.chooseType) {
case BI.Selection.Single: case BI.Selection.Single:
return values[0]; return values[0];
break;
case BI.Selection.Multi: case BI.Selection.Multi:
return values[index]; return values[index];
default: default:
@ -244,9 +257,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
this.popup.setValue(this._digest(valueItem)); this.popup.setValue(this._digest(valueItem));
}, },
_getValue: function () {
var v = [];
BI.each(this.popup.getAllButtons(), function (i, item) {
i % 2 === 0 && v.push(item.getValue());
});
return v;
},
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this._checkValues(this.popup.getValue()); var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) { BI.each(values, function (i, value) {
var valueItem = {}; var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {

4
src/widget/multiselect/multiselect..insert.combo.js

@ -237,7 +237,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -260,7 +260,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

4
src/widget/multiselect/multiselect.combo.js

@ -236,7 +236,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -259,7 +259,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

4
src/widget/multiselectlist/multiselectlist.insert.js

@ -204,7 +204,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -229,7 +229,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA, type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

4
src/widget/multiselectlist/multiselectlist.js

@ -193,7 +193,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) { }, function (ob) {
self._allData = BI.pluck(ob.items, "value"); self._allData = BI.map(ob.items, "value");
digest(self._allData); digest(self._allData);
}); });
} else { } else {
@ -218,7 +218,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA, type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword() keyword: self.trigger.getKeyword()
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

4
src/widget/singleselect/singleselect.combo.js

@ -216,7 +216,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -239,7 +239,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

4
src/widget/singleselectaddsearch/singleselect.combo.js

@ -216,7 +216,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.pluck(ob.items, "value"); var values = BI.map(ob.items, "value");
digest(values); digest(values);
}); });
@ -239,7 +239,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA, type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.pluck(ob.items, "value"); var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) { if (self.storeValue.type === res.type) {
var change = false; var change = false;
var map = self._makeMap(self.storeValue.value); var map = self._makeMap(self.storeValue.value);

Loading…
Cancel
Save