Browse Source

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

* commit '87674c50d42483b1d6699c8c1cd5be0084f1993b':
  trigger.text.select.small
es6
guy 7 years ago
parent
commit
4e288d2714
  1. 2
      dist/base.js
  2. 8
      dist/bundle.js
  3. 4
      dist/case.js
  4. 2
      dist/core.js
  5. 4
      src/case/trigger/trigger.text.select.small.js
  6. 2
      utils/utils.js

2
dist/base.js vendored

@ -19170,8 +19170,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) {

8
dist/bundle.js vendored

@ -19488,7 +19488,7 @@ if (!window.BI) {
}); });
// 集合相关方法 // 集合相关方法
_.each(["where", "findWhere", "contains", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) { _.each(["where", "findWhere", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) {
BI[name] = _apply(name); BI[name] = _apply(name);
}); });
_.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min", _.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
@ -52997,8 +52997,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) {
@ -84780,7 +84782,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) {

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) {

2
dist/core.js vendored

@ -19488,7 +19488,7 @@ if (!window.BI) {
}); });
// 集合相关方法 // 集合相关方法
_.each(["where", "findWhere", "contains", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) { _.each(["where", "findWhere", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) {
BI[name] = _apply(name); BI[name] = _apply(name);
}); });
_.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min", _.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",

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) {

2
utils/utils.js

@ -10696,7 +10696,7 @@ if (!window.BI) {
}); });
// 集合相关方法 // 集合相关方法
_.each(["where", "findWhere", "contains", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) { _.each(["where", "findWhere", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) {
BI[name] = _apply(name); BI[name] = _apply(name);
}); });
_.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min", _.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",

Loading…
Cancel
Save