fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #303 in ~GUY/fineui from ~WINDY/fineui:master to master 

* commit 'c243d1daf688367c41f8b1420f70025f410117b8':
  downlistcombo的getValue处理
es6
windy 7 years ago
parent
ed02ce8d8e c243d1daf6
commit
827cb12600
6 changed files with 547 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 320
      demo/js/widget/downlist/demo.downlist.js
  2. 22
      dist/bundle.js
  3. 322
      dist/demo.js
  4. 22
      dist/fineui.js
  5. 22
      dist/widget.js
  6. 22
      src/widget/downlist/popup.downlist.js

320
demo/js/widget/downlist/demo.downlist.js
Unescape View File

@ -1,3 +1,144 @@
BICst.CONF = {};
BICst.CONF.GROUP = {};
BICst.CONF.GROUP.NUMBER = {};
BICst.CONF.GROUP.NUMBER = {};
BICst.CONF.GROUP.NUMBER.GROUP_BY_VALUE = 1;
BICst.CONF.GROUP.NUMBER.CUSTOM_NUMBER_GROUP = 2;
BICst.CONF.GROUP.NUMBER.SUM = 3;
BICst.CONF.GROUP.NUMBER.AVG = 4;
BICst.CONF.GROUP.NUMBER.MEDIAN = 5;
BICst.CONF.GROUP.NUMBER.MAX = 6;
BICst.CONF.GROUP.NUMBER.MIN = 7;
BICst.CONF.GROUP.NUMBER.STANDARD_DEVIATION = 8;
BICst.CONF.GROUP.NUMBER.VARIANCE = 9;
BICst.CONF.GROUP.NUMBER.COUNT = 10;
BICst.CONF.GROUP.NUMBER.RECORD_COUNT = 11;
BICst.CONF.GROUP.NUMBER.NONE = 12;
BICst.CONF.GROUP.NUMBER.PERIOD = 13;
BICst.CONF.GROUP.NUMBER.RING = 14;
BICst.CONF.GROUP.NUMBER.PERIOD_RATE = 15;
BICst.CONF.GROUP.NUMBER.RING_RATE = 16;
BICst.CONF.GROUP.NUMBER.YEAR = 17;
BICst.CONF.GROUP.NUMBER.QUARTER = 18;
BICst.CONF.GROUP.NUMBER.MONTH = 19;
BICst.CONF.GROUP.NUMBER.WEEK = 20;
BICst.CONF.GROUP.NUMBER.WEEKDAY = 21;
BICst.CONF.GROUP.NUMBER.RENAME = 22;
BICst.CONF.GROUP.NUMBER.DELETE = 23;
// 数值字段汇总设置
var items = [[{
text: BI.i18nText("BI-Basic_Qiu_Sum"),
value: BICst.CONF.GROUP.NUMBER.SUM,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Avg"),
value: BICst.CONF.GROUP.NUMBER.AVG,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Median"),
value: BICst.CONF.GROUP.NUMBER.MEDIAN,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Max"),
value: BICst.CONF.GROUP.NUMBER.MAX,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Min"),
value: BICst.CONF.GROUP.NUMBER.MIN,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Standard_Deviation"),
value: BICst.CONF.GROUP.NUMBER.STANDARD_DEVIATION,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Variance"),
value: BICst.CONF.GROUP.NUMBER.VARIANCE,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_No_Repeat_Count"),
value: BICst.CONF.GROUP.NUMBER.COUNT,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Record_Count"),
value: BICst.CONF.GROUP.NUMBER.RECORD_COUNT,
cls: "dot-ha-font"
}], [{
text: BI.i18nText("BI-Basic_None"),
value: BICst.CONF.GROUP.NUMBER.NONE,
cls: "dot-ha-font"
}, {
el: {
text: BI.i18nText("BI-Basic_Qiu_Same_Period"),
value: BICst.CONF.GROUP.NUMBER.PERIOD,
cls: "dot-ha-font"
},
children: [{
text: BI.i18nText("BI-Basic_Multi_Date_Year"),
value: BICst.CONF.GROUP.NUMBER.YEAR,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Quarter"),
value: BICst.CONF.GROUP.NUMBER.QUARTER,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Month"),
value: BICst.CONF.GROUP.NUMBER.MONTH,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Week"),
value: BICst.CONF.GROUP.NUMBER.WEEK,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Week_XingQi"),
value: BICst.CONF.GROUP.NUMBER.WEEKDAY,
cls: "dot-ha-font"
}]
}, {
text: BI.i18nText("BI-Basic_Qiu_Same_Ring"),
value: BICst.CONF.GROUP.NUMBER.RING,
cls: "dot-ha-font"
}, {
el: {
text: BI.i18nText("BI-Basic_Qiu_Same_Period_Rate"),
value: BICst.CONF.GROUP.NUMBER.PERIOD_RATE,
cls: "dot-ha-font"
},
children: [{
text: BI.i18nText("BI-Basic_Multi_Date_Year"),
value: BICst.CONF.GROUP.NUMBER.YEAR,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Quarter"),
value: BICst.CONF.GROUP.NUMBER.QUARTER,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Month"),
value: BICst.CONF.GROUP.NUMBER.MONTH,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Week"),
value: BICst.CONF.GROUP.NUMBER.WEEK,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Week_XingQi"),
value: BICst.CONF.GROUP.NUMBER.WEEKDAY,
cls: "dot-ha-font"
}]
}, {
text: BI.i18nText("BI-Basic_Qiu_Same_Ring_Rate"),
value: BICst.CONF.GROUP.NUMBER.RING_RATE,
cls: "dot-ha-font"
}], [{
text: BI.i18nText("BI-Basic_Rename"),
value: BICst.CONF.GROUP.NUMBER.RENAME,
cls: "widget-combo-rename-edit-font"
}], [{
text: BI.i18nText("BI-Basic_Remove"),
value: BICst.CONF.GROUP.NUMBER.DELETE,
cls: "delete-h-font"
}]];
Demo.Downlist = BI.inherit(BI.Widget, { Demo.Downlist = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "demo-downlist" baseCls: "demo-downlist"
@ -26,97 +167,98 @@ Demo.Downlist = BI.inherit(BI.Widget, {
self.downlist = _ref; self.downlist = _ref;
}, },
cls: "layout-bg3", cls: "layout-bg3",
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: items
[{ // items: [
el: { // [{
text: "column 1111", // el: {
iconCls1: "check-mark-e-font", // text: "column 1111",
value: 11 // iconCls1: "check-mark-e-font",
}, // value: 11
children: [{ // },
text: "column 1.1", // children: [{
value: 21, // text: "column 1.1",
cls: "dot-e-font" // value: 21,
}, { // cls: "dot-e-font"
text: "column 1.222222222222222222222222222222222222", // }, {
cls: "dot-e-font", // text: "column 1.222222222222222222222222222222222222",
value: 22 // cls: "dot-e-font",
}] // value: 22
}], // }]
[{ // }],
el: { // [{
type: "bi.icon_text_icon_item", // el: {
text: "column 2", // type: "bi.icon_text_icon_item",
iconCls1: "chart-type-e-font", // text: "column 2",
cls: "dot-e-font", // iconCls1: "chart-type-e-font",
value: 12 // cls: "dot-e-font",
}, // value: 12
disabled: true, // },
children: [{ // disabled: true,
type: "bi.icon_text_item", // children: [{
cls: "dot-e-font", // type: "bi.icon_text_item",
height: 25, // cls: "dot-e-font",
text: "column 2.1", // height: 25,
value: 11 // text: "column 2.1",
}, { // value: 11
text: "column 2.2", // }, {
value: 12, // text: "column 2.2",
cls: "dot-e-font" // value: 12,
}] // cls: "dot-e-font"
}], // }]
[{ // }],
text: "column 8", // [{
value: 18, // text: "column 8",
cls: "dot-e-font" // value: 18,
}, // cls: "dot-e-font"
{ // },
// {
text: "column 9", //
cls: "dot-e-font", // text: "column 9",
value: 19 // cls: "dot-e-font",
} // value: 19
], // }
[{ // ],
text: "column 10", // [{
value: 20, // text: "column 10",
cls: "dot-e-font" // value: 20,
}, // cls: "dot-e-font"
{ // },
// {
text: "column 11", //
cls: "dot-e-font", // text: "column 11",
value: 21 // cls: "dot-e-font",
}, // value: 21
{ // },
// {
text: "column 12", //
cls: "dot-e-font", // text: "column 12",
value: 22 // cls: "dot-e-font",
}, // value: 22
{ // },
// {
text: "column 13", //
cls: "dot-e-font", // text: "column 13",
value: 23 // cls: "dot-e-font",
}, // value: 23
{ // },
// {
text: "column 14", //
cls: "dot-e-font", // text: "column 14",
value: 24 // cls: "dot-e-font",
}, // value: 24
{ // },
// {
text: "column 15", //
cls: "dot-e-font", // text: "column 15",
value: 23 // cls: "dot-e-font",
} // value: 23
] // }
// ]
] //
// ]
}, { }, {
type: "bi.label", type: "bi.label",
text: "显示选择值", text: "显示选择值",

22
dist/bundle.js vendored
Unescape View File

@ -80390,6 +80390,26 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
return valueArray; return valueArray;
}, },
_checkValues: function (values) {
var self = this;
var value = [];
BI.each(this.options.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, values[idx])){
value.push(values[idx]);
}
}else{
if(item.value === values[idx]){
value.push(values[idx]);
}
}
})
});
return value;
},
populate: function (items) { populate: function (items) {
BI.DownListPopup.superclass.populate.apply(this, arguments); BI.DownListPopup.superclass.populate.apply(this, arguments);
var self = this; var self = this;
@ -80411,7 +80431,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this.popup.getValue(); var values = this._checkValues(this.popup.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])) {

322
dist/demo.js vendored
Unescape View File

@ -12326,7 +12326,148 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.date_time", Demo.CustomDateTime);Demo.Downlist = BI.inherit(BI.Widget, { BI.shortcut("demo.date_time", Demo.CustomDateTime);BICst.CONF = {};
BICst.CONF.GROUP = {};
BICst.CONF.GROUP.NUMBER = {};
BICst.CONF.GROUP.NUMBER = {};
BICst.CONF.GROUP.NUMBER.GROUP_BY_VALUE = 1;
BICst.CONF.GROUP.NUMBER.CUSTOM_NUMBER_GROUP = 2;
BICst.CONF.GROUP.NUMBER.SUM = 3;
BICst.CONF.GROUP.NUMBER.AVG = 4;
BICst.CONF.GROUP.NUMBER.MEDIAN = 5;
BICst.CONF.GROUP.NUMBER.MAX = 6;
BICst.CONF.GROUP.NUMBER.MIN = 7;
BICst.CONF.GROUP.NUMBER.STANDARD_DEVIATION = 8;
BICst.CONF.GROUP.NUMBER.VARIANCE = 9;
BICst.CONF.GROUP.NUMBER.COUNT = 10;
BICst.CONF.GROUP.NUMBER.RECORD_COUNT = 11;
BICst.CONF.GROUP.NUMBER.NONE = 12;
BICst.CONF.GROUP.NUMBER.PERIOD = 13;
BICst.CONF.GROUP.NUMBER.RING = 14;
BICst.CONF.GROUP.NUMBER.PERIOD_RATE = 15;
BICst.CONF.GROUP.NUMBER.RING_RATE = 16;
BICst.CONF.GROUP.NUMBER.YEAR = 17;
BICst.CONF.GROUP.NUMBER.QUARTER = 18;
BICst.CONF.GROUP.NUMBER.MONTH = 19;
BICst.CONF.GROUP.NUMBER.WEEK = 20;
BICst.CONF.GROUP.NUMBER.WEEKDAY = 21;
BICst.CONF.GROUP.NUMBER.RENAME = 22;
BICst.CONF.GROUP.NUMBER.DELETE = 23;
// 数值字段汇总设置
var items = [[{
text: BI.i18nText("BI-Basic_Qiu_Sum"),
value: BICst.CONF.GROUP.NUMBER.SUM,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Avg"),
value: BICst.CONF.GROUP.NUMBER.AVG,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Median"),
value: BICst.CONF.GROUP.NUMBER.MEDIAN,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Max"),
value: BICst.CONF.GROUP.NUMBER.MAX,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Min"),
value: BICst.CONF.GROUP.NUMBER.MIN,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Standard_Deviation"),
value: BICst.CONF.GROUP.NUMBER.STANDARD_DEVIATION,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Qiu_Variance"),
value: BICst.CONF.GROUP.NUMBER.VARIANCE,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_No_Repeat_Count"),
value: BICst.CONF.GROUP.NUMBER.COUNT,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Record_Count"),
value: BICst.CONF.GROUP.NUMBER.RECORD_COUNT,
cls: "dot-ha-font"
}], [{
text: BI.i18nText("BI-Basic_None"),
value: BICst.CONF.GROUP.NUMBER.NONE,
cls: "dot-ha-font"
}, {
el: {
text: BI.i18nText("BI-Basic_Qiu_Same_Period"),
value: BICst.CONF.GROUP.NUMBER.PERIOD,
cls: "dot-ha-font"
},
children: [{
text: BI.i18nText("BI-Basic_Multi_Date_Year"),
value: BICst.CONF.GROUP.NUMBER.YEAR,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Quarter"),
value: BICst.CONF.GROUP.NUMBER.QUARTER,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Month"),
value: BICst.CONF.GROUP.NUMBER.MONTH,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Week"),
value: BICst.CONF.GROUP.NUMBER.WEEK,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Week_XingQi"),
value: BICst.CONF.GROUP.NUMBER.WEEKDAY,
cls: "dot-ha-font"
}]
}, {
text: BI.i18nText("BI-Basic_Qiu_Same_Ring"),
value: BICst.CONF.GROUP.NUMBER.RING,
cls: "dot-ha-font"
}, {
el: {
text: BI.i18nText("BI-Basic_Qiu_Same_Period_Rate"),
value: BICst.CONF.GROUP.NUMBER.PERIOD_RATE,
cls: "dot-ha-font"
},
children: [{
text: BI.i18nText("BI-Basic_Multi_Date_Year"),
value: BICst.CONF.GROUP.NUMBER.YEAR,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Quarter"),
value: BICst.CONF.GROUP.NUMBER.QUARTER,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Month"),
value: BICst.CONF.GROUP.NUMBER.MONTH,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Multi_Date_Week"),
value: BICst.CONF.GROUP.NUMBER.WEEK,
cls: "dot-ha-font"
}, {
text: BI.i18nText("BI-Basic_Week_XingQi"),
value: BICst.CONF.GROUP.NUMBER.WEEKDAY,
cls: "dot-ha-font"
}]
}, {
text: BI.i18nText("BI-Basic_Qiu_Same_Ring_Rate"),
value: BICst.CONF.GROUP.NUMBER.RING_RATE,
cls: "dot-ha-font"
}], [{
text: BI.i18nText("BI-Basic_Rename"),
value: BICst.CONF.GROUP.NUMBER.RENAME,
cls: "widget-combo-rename-edit-font"
}], [{
text: BI.i18nText("BI-Basic_Remove"),
value: BICst.CONF.GROUP.NUMBER.DELETE,
cls: "delete-h-font"
}]];
Demo.Downlist = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "demo-downlist" baseCls: "demo-downlist"
}, },
@ -12354,97 +12495,98 @@ BI.shortcut("demo.date_time", Demo.CustomDateTime);Demo.Downlist = BI.inherit(BI
self.downlist = _ref; self.downlist = _ref;
}, },
cls: "layout-bg3", cls: "layout-bg3",
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: items
[{ // items: [
el: { // [{
text: "column 1111", // el: {
iconCls1: "check-mark-e-font", // text: "column 1111",
value: 11 // iconCls1: "check-mark-e-font",
}, // value: 11
children: [{ // },
text: "column 1.1", // children: [{
value: 21, // text: "column 1.1",
cls: "dot-e-font" // value: 21,
}, { // cls: "dot-e-font"
text: "column 1.222222222222222222222222222222222222", // }, {
cls: "dot-e-font", // text: "column 1.222222222222222222222222222222222222",
value: 22 // cls: "dot-e-font",
}] // value: 22
}], // }]
[{ // }],
el: { // [{
type: "bi.icon_text_icon_item", // el: {
text: "column 2", // type: "bi.icon_text_icon_item",
iconCls1: "chart-type-e-font", // text: "column 2",
cls: "dot-e-font", // iconCls1: "chart-type-e-font",
value: 12 // cls: "dot-e-font",
}, // value: 12
disabled: true, // },
children: [{ // disabled: true,
type: "bi.icon_text_item", // children: [{
cls: "dot-e-font", // type: "bi.icon_text_item",
height: 25, // cls: "dot-e-font",
text: "column 2.1", // height: 25,
value: 11 // text: "column 2.1",
}, { // value: 11
text: "column 2.2", // }, {
value: 12, // text: "column 2.2",
cls: "dot-e-font" // value: 12,
}] // cls: "dot-e-font"
}], // }]
[{ // }],
text: "column 8", // [{
value: 18, // text: "column 8",
cls: "dot-e-font" // value: 18,
}, // cls: "dot-e-font"
{ // },
// {
text: "column 9", //
cls: "dot-e-font", // text: "column 9",
value: 19 // cls: "dot-e-font",
} // value: 19
], // }
[{ // ],
text: "column 10", // [{
value: 20, // text: "column 10",
cls: "dot-e-font" // value: 20,
}, // cls: "dot-e-font"
{ // },
// {
text: "column 11", //
cls: "dot-e-font", // text: "column 11",
value: 21 // cls: "dot-e-font",
}, // value: 21
{ // },
// {
text: "column 12", //
cls: "dot-e-font", // text: "column 12",
value: 22 // cls: "dot-e-font",
}, // value: 22
{ // },
// {
text: "column 13", //
cls: "dot-e-font", // text: "column 13",
value: 23 // cls: "dot-e-font",
}, // value: 23
{ // },
// {
text: "column 14", //
cls: "dot-e-font", // text: "column 14",
value: 24 // cls: "dot-e-font",
}, // value: 24
{ // },
// {
text: "column 15", //
cls: "dot-e-font", // text: "column 15",
value: 23 // cls: "dot-e-font",
} // value: 23
] // }
// ]
] //
// ]
}, { }, {
type: "bi.label", type: "bi.label",
text: "显示选择值", text: "显示选择值",

22
dist/fineui.js vendored
Unescape View File

@ -82084,6 +82084,26 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
return valueArray; return valueArray;
}, },
_checkValues: function (values) {
var self = this;
var value = [];
BI.each(this.options.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, values[idx])){
value.push(values[idx]);
}
}else{
if(item.value === values[idx]){
value.push(values[idx]);
}
}
})
});
return value;
},
populate: function (items) { populate: function (items) {
BI.DownListPopup.superclass.populate.apply(this, arguments); BI.DownListPopup.superclass.populate.apply(this, arguments);
var self = this; var self = this;
@ -82105,7 +82125,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this.popup.getValue(); var values = this._checkValues(this.popup.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])) {

22
dist/widget.js vendored
Unescape View File

@ -3976,6 +3976,26 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
return valueArray; return valueArray;
}, },
_checkValues: function (values) {
var self = this;
var value = [];
BI.each(this.options.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, values[idx])){
value.push(values[idx]);
}
}else{
if(item.value === values[idx]){
value.push(values[idx]);
}
}
})
});
return value;
},
populate: function (items) { populate: function (items) {
BI.DownListPopup.superclass.populate.apply(this, arguments); BI.DownListPopup.superclass.populate.apply(this, arguments);
var self = this; var self = this;
@ -3997,7 +4017,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this.popup.getValue(); var values = this._checkValues(this.popup.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])) {

22
src/widget/downlist/popup.downlist.js
Unescape View File

@ -193,6 +193,26 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
return valueArray; return valueArray;
}, },
_checkValues: function (values) {
var self = this;
var value = [];
BI.each(this.options.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, values[idx])){
value.push(values[idx]);
}
}else{
if(item.value === values[idx]){
value.push(values[idx]);
}
}
})
});
return value;
},
populate: function (items) { populate: function (items) {
BI.DownListPopup.superclass.populate.apply(this, arguments); BI.DownListPopup.superclass.populate.apply(this, arguments);
var self = this; var self = this;
@ -214,7 +234,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
getValue: function () { getValue: function () {
var self = this, result = []; var self = this, result = [];
var values = this.popup.getValue(); var values = this._checkValues(this.popup.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])) {

Write Preview
Loading…
Cancel
Save