Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
es6
guy 7 years ago
parent
commit
b1c693b5a1
  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. 40
      dist/bundle.min.js
  5. 12
      dist/demo.js
  6. 65
      dist/fineui.js
  7. 40
      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: "全选",
onCheck: function (v) {
if (v) {
multiCombo.setValue(BI.pluck(BI.deepClone(self.years), "value"));
multiCombo.setValue(BI.map(BI.deepClone(self.years), "value"));
} else {
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}],
height: 30,
width: 100,
items: [
items: [[{text: "temp", value: 1111111}],
[{
el: {
text: "column 1111",
@ -80,17 +80,17 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 2",
iconCls1: "chart-type-e-font",
cls: "dot-e-font",
value: 11
value: 12
},
children: [{
type: "bi.icon_text_item",
cls: "dot-e-font",
height: 25,
text: "column 2.1",
value: 21
value: 11
}, {
text: "column 2.2",
value: 22,
value: 12,
cls: "dot-e-font"
}]
}],
@ -139,7 +139,7 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 15",
cls: "dot-e-font",
value: 23,
value: 25,
bubble: "hahahaha"
}
]

65
dist/bundle.js vendored

@ -86699,25 +86699,38 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
var value = [];
BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){
var childValues = BI.pluck(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){
value.push(valueGetter(idx));
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx));
if(BI.isNotEmptyString(v)) {
value.push(v);
}
}else{
if(item.value === valueGetter(idx)){
value.push(valueGetter(idx));
if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)[0]);
}
}
})
});
});
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) {
case BI.Selection.Single:
return values[0];
break;
case BI.Selection.Multi:
return values[index];
default:
@ -86745,9 +86758,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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 () {
var self = this, result = [];
var values = this._checkValues(this.popup.getValue());
var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) {
var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) {
@ -91731,7 +91752,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -91754,7 +91775,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -92088,7 +92109,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -92111,7 +92132,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -93541,7 +93562,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -93566,7 +93587,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -93855,7 +93876,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -93880,7 +93901,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -98372,7 +98393,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -98395,7 +98416,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -99689,7 +99710,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -99712,7 +99733,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);

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

65
dist/fineui.js vendored

@ -88463,25 +88463,38 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
var value = [];
BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){
var childValues = BI.pluck(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){
value.push(valueGetter(idx));
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx));
if(BI.isNotEmptyString(v)) {
value.push(v);
}
}else{
if(item.value === valueGetter(idx)){
value.push(valueGetter(idx));
if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)[0]);
}
}
})
});
});
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) {
case BI.Selection.Single:
return values[0];
break;
case BI.Selection.Multi:
return values[index];
default:
@ -88509,9 +88522,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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 () {
var self = this, result = [];
var values = this._checkValues(this.popup.getValue());
var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) {
var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) {
@ -93495,7 +93516,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -93518,7 +93539,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -93852,7 +93873,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -93875,7 +93896,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -95305,7 +95326,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -95330,7 +95351,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -95619,7 +95640,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -95644,7 +95665,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -100136,7 +100157,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -100159,7 +100180,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -101453,7 +101474,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -101476,7 +101497,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);

40
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 = [];
BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){
var childValues = BI.pluck(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){
value.push(valueGetter(idx));
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx));
if(BI.isNotEmptyString(v)) {
value.push(v);
}
}else{
if(item.value === valueGetter(idx)){
value.push(valueGetter(idx));
if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)[0]);
}
}
})
});
});
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) {
case BI.Selection.Single:
return values[0];
break;
case BI.Selection.Multi:
return values[index];
default:
@ -2398,9 +2411,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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 () {
var self = this, result = [];
var values = this._checkValues(this.popup.getValue());
var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) {
var valueItem = {};
if (BI.isNotNull(self.childValueMap[value])) {
@ -7384,7 +7405,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -7407,7 +7428,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -7741,7 +7762,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -7764,7 +7785,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -9194,7 +9215,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
o.itemsCreator({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -9219,7 +9240,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -9508,7 +9529,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -9533,7 +9554,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -14025,7 +14046,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -14048,7 +14069,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);
@ -15342,7 +15363,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -15365,7 +15386,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
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 = [];
BI.each(o.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)){
var childValues = BI.pluck(item.children, "value");
if(BI.contains(childValues, valueGetter(idx))){
value.push(valueGetter(idx));
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx));
if(BI.isNotEmptyString(v)) {
value.push(v);
}
}else{
if(item.value === valueGetter(idx)){
value.push(valueGetter(idx));
if(item.value === valueGetter(idx)[0]) {
value.push(valueGetter(idx)[0]);
}
}
})
});
});
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) {
case BI.Selection.Single:
return values[0];
break;
case BI.Selection.Multi:
return values[index];
default:
@ -244,9 +257,17 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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 () {
var self = this, result = [];
var values = this._checkValues(this.popup.getValue());
var values = this._checkValues(this._getValue());
BI.each(values, function (i, value) {
var valueItem = {};
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,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -260,7 +260,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
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,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -259,7 +259,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
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({
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -229,7 +229,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
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({
type: BI.MultiSelectList.REQ_GET_ALL_DATA
}, function (ob) {
self._allData = BI.pluck(ob.items, "value");
self._allData = BI.map(ob.items, "value");
digest(self._allData);
});
} else {
@ -218,7 +218,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
type: BI.MultiSelectList.REQ_GET_ALL_DATA,
keyword: self.trigger.getKeyword()
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
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,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -239,7 +239,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
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,
keywords: keywords
}, function (ob) {
var values = BI.pluck(ob.items, "value");
var values = BI.map(ob.items, "value");
digest(values);
});
@ -239,7 +239,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()]
}, function (ob) {
var items = BI.pluck(ob.items, "value");
var items = BI.map(ob.items, "value");
if (self.storeValue.type === res.type) {
var change = false;
var map = self._makeMap(self.storeValue.value);

Loading…
Cancel
Save