Browse Source

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

* commit '4f64cac5edb08e569649aba66454056c58417870':
  update
  getValue修改
master
guy 7 years ago
parent
commit
f57c30660a
  1. 18
      dist/_fineui.min.js
  2. 7
      dist/bundle.js
  3. 14
      dist/bundle.min.js
  4. 18
      dist/fineui.min.js
  5. 7
      dist/widget.js
  6. 7
      src/widget/multilayerdownlist/popup.downlist.js

18
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -90594,7 +90594,9 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
var changedValue = value; var changedValue = value;
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
changedValue = self.childValueMap[value]; changedValue = self.childValueMap[value];
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_SON_VALUE_CHANGE, changedValue, self.fatherValueMap[value]); var fatherValue = self.fatherValueMap[value];
var fatherArrayValue = (fatherValue + "").split("_");
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_SON_VALUE_CHANGE, changedValue, fatherArrayValue.length > 1 ? fatherArrayValue : fatherValue);
} else { } else {
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object); self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object);
} }
@ -90854,7 +90856,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
var fartherValue = self.fatherValueMap[value]; var fartherValue = self.fatherValueMap[value];
valueItem.childValue = self.childValueMap[value]; valueItem.childValue = self.childValueMap[value];
valueItem.value = fartherValue.split("_"); var fatherArrayValue = (fartherValue + "").split("_");
valueItem.value = fatherArrayValue.length > 1 ? fatherArrayValue : fartherValue;
} else { } else {
valueItem.value = value; valueItem.value = value;
} }

14
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

18
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/widget.js vendored

@ -5749,7 +5749,9 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
var changedValue = value; var changedValue = value;
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
changedValue = self.childValueMap[value]; changedValue = self.childValueMap[value];
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_SON_VALUE_CHANGE, changedValue, self.fatherValueMap[value]); var fatherValue = self.fatherValueMap[value];
var fatherArrayValue = (fatherValue + "").split("_");
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_SON_VALUE_CHANGE, changedValue, fatherArrayValue.length > 1 ? fatherArrayValue : fatherValue);
} else { } else {
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object); self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object);
} }
@ -6009,7 +6011,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
var fartherValue = self.fatherValueMap[value]; var fartherValue = self.fatherValueMap[value];
valueItem.childValue = self.childValueMap[value]; valueItem.childValue = self.childValueMap[value];
valueItem.value = fartherValue.split("_"); var fatherArrayValue = (fartherValue + "").split("_");
valueItem.value = fatherArrayValue.length > 1 ? fatherArrayValue : fartherValue;
} else { } else {
valueItem.value = value; valueItem.value = value;
} }

7
src/widget/multilayerdownlist/popup.downlist.js

@ -47,7 +47,9 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
var changedValue = value; var changedValue = value;
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
changedValue = self.childValueMap[value]; changedValue = self.childValueMap[value];
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_SON_VALUE_CHANGE, changedValue, self.fatherValueMap[value]); var fatherValue = self.fatherValueMap[value];
var fatherArrayValue = (fatherValue + "").split("_");
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_SON_VALUE_CHANGE, changedValue, fatherArrayValue.length > 1 ? fatherArrayValue : fatherValue);
} else { } else {
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object); self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object);
} }
@ -307,7 +309,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
if (BI.isNotNull(self.childValueMap[value])) { if (BI.isNotNull(self.childValueMap[value])) {
var fartherValue = self.fatherValueMap[value]; var fartherValue = self.fatherValueMap[value];
valueItem.childValue = self.childValueMap[value]; valueItem.childValue = self.childValueMap[value];
valueItem.value = fartherValue.split("_"); var fatherArrayValue = (fartherValue + "").split("_");
valueItem.value = fatherArrayValue.length > 1 ? fatherArrayValue : fartherValue;
} else { } else {
valueItem.value = value; valueItem.value = value;
} }

Loading…
Cancel
Save