From 87674c50d42483b1d6699c8c1cd5be0084f1993b Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 12 Mar 2018 12:58:51 +0800
Subject: [PATCH] trigger.text.select.small

---
 dist/base.js                                  |  4 +++-
 dist/bundle.js                                | 10 +++++++---
 dist/case.js                                  |  4 +++-
 dist/core.js                                  |  2 +-
 src/case/trigger/trigger.text.select.small.js |  4 +++-
 utils/utils.js                                |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/dist/base.js b/dist/base.js
index 0da04ec55..cb3a980c8 100644
--- a/dist/base.js
+++ b/dist/base.js
@@ -19170,7 +19170,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);
diff --git a/dist/bundle.js b/dist/bundle.js
index 5bacf35d8..69b7791c9 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -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);
     });
     _.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
@@ -52997,7 +52997,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);
@@ -84780,7 +84782,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) {
diff --git a/dist/case.js b/dist/case.js
index 2de571467..a366784d4 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -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) {
diff --git a/dist/core.js b/dist/core.js
index 8e5ff5a69..bdb4863bc 100644
--- a/dist/core.js
+++ b/dist/core.js
@@ -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);
     });
     _.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
diff --git a/src/case/trigger/trigger.text.select.small.js b/src/case/trigger/trigger.text.select.small.js
index ef7b67c60..f60b3b949 100644
--- a/src/case/trigger/trigger.text.select.small.js
+++ b/src/case/trigger/trigger.text.select.small.js
@@ -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) {
diff --git a/utils/utils.js b/utils/utils.js
index 809f612f6..099e67164 100644
--- a/utils/utils.js
+++ b/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);
     });
     _.each(["get", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",