Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~young/fineui

es6
Young 7 years ago
parent
commit
7fb22368a1
  1. 18
      dist/_fineui.min.js
  2. 2
      dist/base.js
  3. 13
      dist/bundle.js
  4. 14
      dist/bundle.min.js
  5. 4
      dist/case.js
  6. 18
      dist/fineui.min.js
  7. 7
      dist/widget.js
  8. 2
      src/base/single/input/file.js
  9. 4
      src/case/trigger/trigger.text.select.small.js
  10. 7
      src/widget/multilayerdownlist/popup.downlist.js

18
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.js vendored

@ -19202,8 +19202,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
break; break;
} }
}; };
if (isFunction(upload.onloadstart)) {
upload.onloadstart(); upload.onloadstart();
} }
}
var boundary = "AjaxUploadBoundary" + (new Date).getTime(); var boundary = "AjaxUploadBoundary" + (new Date).getTime();
xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary); xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
if (handler.file.getAsBinary) { if (handler.file.getAsBinary) {

13
dist/bundle.js vendored

@ -53029,8 +53029,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
break; break;
} }
}; };
if (isFunction(upload.onloadstart)) {
upload.onloadstart(); upload.onloadstart();
} }
}
var boundary = "AjaxUploadBoundary" + (new Date).getTime(); var boundary = "AjaxUploadBoundary" + (new Date).getTime();
xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary); xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
if (handler.file.getAsBinary) { if (handler.file.getAsBinary) {
@ -84812,7 +84814,9 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
this.trigger.setText(this._digest(vals, this.options.items)); var formatValue = this._digest(vals, this.options.items);
this.trigger.element.removeClass("bi-water-mark").addClass(formatValue.cls);
this.trigger.setText(formatValue.text);
}, },
populate: function (items) { populate: function (items) {
@ -90626,7 +90630,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);
} }
@ -90886,7 +90892,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

4
dist/case.js vendored

@ -14322,7 +14322,9 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
this.trigger.setText(this._digest(vals, this.options.items)); var formatValue = this._digest(vals, this.options.items);
this.trigger.element.removeClass("bi-water-mark").addClass(formatValue.cls);
this.trigger.setText(formatValue.text);
}, },
populate: function (items) { populate: function (items) {

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;
} }

2
src/base/single/input/file.js

@ -214,8 +214,10 @@
break; break;
} }
}; };
if (isFunction(upload.onloadstart)) {
upload.onloadstart(); upload.onloadstart();
} }
}
var boundary = "AjaxUploadBoundary" + (new Date).getTime(); var boundary = "AjaxUploadBoundary" + (new Date).getTime();
xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary); xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
if (handler.file.getAsBinary) { if (handler.file.getAsBinary) {

4
src/case/trigger/trigger.text.select.small.js

@ -52,7 +52,9 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
this.trigger.setText(this._digest(vals, this.options.items)); var formatValue = this._digest(vals, this.options.items);
this.trigger.element.removeClass("bi-water-mark").addClass(formatValue.cls);
this.trigger.setText(formatValue.text);
}, },
populate: function (items) { populate: function (items) {

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