Browse Source

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

* commit 'a99ed86cbe6c358e87db6eea188cdf526774d2d4':
  修改valuegetter
es6
guy 7 years ago
parent
commit
299345effd
  1. 17
      dist/bundle.js
  2. 44
      dist/bundle.min.js
  3. 17
      dist/fineui.js
  4. 42
      dist/fineui.min.js
  5. 17
      dist/widget.js
  6. 17
      src/widget/downlist/popup.downlist.js

17
dist/bundle.js vendored

@ -86992,13 +86992,13 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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.map(item.children, "value"); var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx)); var v = joinValue(childValues, values[idx]);
if(BI.isNotEmptyString(v)) { if(BI.isNotEmptyString(v)) {
value.push(v); value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)[0]) { if(item.value === values[idx][0]) {
value.push(valueGetter(idx)[0]); value.push(values[idx][0]);
} }
} }
}); });
@ -87017,17 +87017,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}); });
return value; return value;
} }
function valueGetter (index) {
switch (o.chooseType) {
case BI.Selection.Single:
return values[0];
case BI.Selection.Multi:
return values[index];
default:
break;
}
}
}, },
populate: function (items) { populate: function (items) {

44
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

17
dist/fineui.js vendored

@ -88756,13 +88756,13 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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.map(item.children, "value"); var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx)); var v = joinValue(childValues, values[idx]);
if(BI.isNotEmptyString(v)) { if(BI.isNotEmptyString(v)) {
value.push(v); value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)[0]) { if(item.value === values[idx][0]) {
value.push(valueGetter(idx)[0]); value.push(values[idx][0]);
} }
} }
}); });
@ -88781,17 +88781,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}); });
return value; return value;
} }
function valueGetter (index) {
switch (o.chooseType) {
case BI.Selection.Single:
return values[0];
case BI.Selection.Multi:
return values[index];
default:
break;
}
}
}, },
populate: function (items) { populate: function (items) {

42
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

17
dist/widget.js vendored

@ -2354,13 +2354,13 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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.map(item.children, "value"); var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx)); var v = joinValue(childValues, values[idx]);
if(BI.isNotEmptyString(v)) { if(BI.isNotEmptyString(v)) {
value.push(v); value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)[0]) { if(item.value === values[idx][0]) {
value.push(valueGetter(idx)[0]); value.push(values[idx][0]);
} }
} }
}); });
@ -2379,17 +2379,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}); });
return value; return value;
} }
function valueGetter (index) {
switch (o.chooseType) {
case BI.Selection.Single:
return values[0];
case BI.Selection.Multi:
return values[index];
default:
break;
}
}
}, },
populate: function (items) { populate: function (items) {

17
src/widget/downlist/popup.downlist.js

@ -200,13 +200,13 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
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.map(item.children, "value"); var childValues = BI.map(item.children, "value");
var v = joinValue(childValues, valueGetter(idx)); var v = joinValue(childValues, values[idx]);
if(BI.isNotEmptyString(v)) { if(BI.isNotEmptyString(v)) {
value.push(v); value.push(v);
} }
}else{ }else{
if(item.value === valueGetter(idx)[0]) { if(item.value === values[idx][0]) {
value.push(valueGetter(idx)[0]); value.push(values[idx][0]);
} }
} }
}); });
@ -225,17 +225,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}); });
return value; return value;
} }
function valueGetter (index) {
switch (o.chooseType) {
case BI.Selection.Single:
return values[0];
case BI.Selection.Multi:
return values[index];
default:
break;
}
}
}, },
populate: function (items) { populate: function (items) {

Loading…
Cancel
Save