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

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

es6
Young 7 years ago
parent
48cce58cd9 b76b4348fa
commit
7fb22368a1
10 changed files with 58 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      dist/_fineui.min.js
  2. 4
      dist/base.js
  3. 15
      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. 4
      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
View File

File diff suppressed because one or more lines are too long

4
dist/base.js vendored
Unescape View File

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

15
dist/bundle.js vendored
Unescape View File

@ -53029,7 +53029,9 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
break;
}
};
upload.onloadstart();
if (isFunction(upload.onloadstart)) {
upload.onloadstart();
}
}
var boundary = "AjaxUploadBoundary" + (new Date).getTime();
xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
@ -84812,7 +84814,9 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
},
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) {
@ -90626,7 +90630,9 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
var changedValue = value;
if (BI.isNotNull(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 {
self.fireEvent(BI.MultiLayerDownListPopup.EVENT_CHANGE, changedValue, object);
}
@ -90886,7 +90892,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
if (BI.isNotNull(self.childValueMap[value])) {
var fartherValue = self.fatherValueMap[value];
valueItem.childValue = self.childValueMap[value];
valueItem.value = fartherValue.split("_");
var fatherArrayValue = (fartherValue + "").split("_");
valueItem.value = fatherArrayValue.length > 1 ? fatherArrayValue : fartherValue;
} else {
valueItem.value = value;
}

14
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/case.js vendored
Unescape View File

@ -14322,7 +14322,9 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
},
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) {

18
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/widget.js vendored
Unescape View File

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

4
src/base/single/input/file.js
Unescape View File

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

4
src/case/trigger/trigger.text.select.small.js
Unescape View File

@ -52,7 +52,9 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
},
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) {

7
src/widget/multilayerdownlist/popup.downlist.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save