Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js

dist/bundle.js

@@ -78478,7 +78478,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         baseCls: "bi-search-text-value-combo",
         height: 30,
         text: "",
-        items: []
+        items: [],
+        tipType: "",
+        warningTitle: ""
     },
 
     render: function () {
@@ -78502,6 +78504,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         height: o.height - 2,
                         text: o.text,
                         value: o.value,
+                        tipType: o.tipType,
+                        warningTitle: o.warningTitle,
                         listeners: [{
                             eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
                             action: function () {
@@ -104955,8 +104959,8 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, {
                 return self.trigger.getKeyword();
             },
             itemsCreator: function (op, callback) {
-                op.keyword = self.trigger.getKeyword();
+                op.keywords = [self.trigger.getKeyword()];
-                this.setKeyword(op.keyword);
+                this.setKeyword(op.keywords[0]);
                 o.itemsCreator(op, callback);
             }
         });

dist/case.js

@@ -6005,7 +6005,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         baseCls: "bi-search-text-value-combo",
         height: 30,
         text: "",
-        items: []
+        items: [],
+        tipType: "",
+        warningTitle: ""
     },
 
     render: function () {
@@ -6029,6 +6031,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         height: o.height - 2,
                         text: o.text,
                         value: o.value,
+                        tipType: o.tipType,
+                        warningTitle: o.warningTitle,
                         listeners: [{
                             eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
                             action: function () {

dist/fineui.js

@@ -78721,7 +78721,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         baseCls: "bi-search-text-value-combo",
         height: 30,
         text: "",
-        items: []
+        items: [],
+        tipType: "",
+        warningTitle: ""
     },
 
     render: function () {
@@ -78745,6 +78747,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         height: o.height - 2,
                         text: o.text,
                         value: o.value,
+                        tipType: o.tipType,
+                        warningTitle: o.warningTitle,
                         listeners: [{
                             eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
                             action: function () {
@@ -105198,8 +105202,8 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, {
                 return self.trigger.getKeyword();
             },
             itemsCreator: function (op, callback) {
-                op.keyword = self.trigger.getKeyword();
+                op.keywords = [self.trigger.getKeyword()];
-                this.setKeyword(op.keyword);
+                this.setKeyword(op.keywords[0]);
                 o.itemsCreator(op, callback);
             }
         });

dist/widget.js

@@ -17402,8 +17402,8 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, {
                 return self.trigger.getKeyword();
             },
             itemsCreator: function (op, callback) {
-                op.keyword = self.trigger.getKeyword();
+                op.keywords = [self.trigger.getKeyword()];
-                this.setKeyword(op.keyword);
+                this.setKeyword(op.keywords[0]);
                 o.itemsCreator(op, callback);
             }
         });

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -7,7 +7,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         baseCls: "bi-search-text-value-combo",
         height: 30,
         text: "",
-        items: []
+        items: [],
+        tipType: "",
+        warningTitle: ""
     },
 
     render: function () {
@@ -31,6 +33,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         height: o.height - 2,
                         text: o.text,
                         value: o.value,
+                        tipType: o.tipType,
+                        warningTitle: o.warningTitle,
                         listeners: [{
                             eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
                             action: function () {

src/widget/singleselect/singleselectlist.insert.js

@@ -48,8 +48,8 @@ BI.SingleSelectInsertList = BI.inherit(BI.Widget, {
                 return self.trigger.getKeyword();
             },
             itemsCreator: function (op, callback) {
-                op.keyword = self.trigger.getKeyword();
+                op.keywords = [self.trigger.getKeyword()];
-                this.setKeyword(op.keyword);
+                this.setKeyword(op.keywords[0]);
                 o.itemsCreator(op, callback);
             }
         });