Merge pull request #800 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '5596b01bff568889fc3474f31a1ff346a60dce0d':
  BI-37380 single_select_combo可配text与multi_select_combo同步一下

demo/js/case/list/demo.select_list.js

@@ -7,6 +7,10 @@ Demo.Func = BI.inherit(BI.Widget, {
         var self = this;
         BI.createWidget({
             type: "bi.select_list",
+            toolbar: {
+                type: "bi.multi_select_bar",
+                iconWrapperWidth: 26
+            },
             element: this,
             el: {
                 el: {

dist/bundle.ie.js

@@ -73194,6 +73194,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
 BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
     props: {
+        baseCls: "bi-number-interval-single-editor",
         tipType: "success",
         title: ""
     },
@@ -75501,6 +75502,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -75770,6 +75772,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -76452,6 +76455,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
@@ -76782,7 +76786,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@@ -76861,7 +76866,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({

dist/bundle.js

@@ -73598,6 +73598,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
 BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
     props: {
+        baseCls: "bi-number-interval-single-editor",
         tipType: "success",
         title: ""
     },
@@ -75905,6 +75906,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -76174,6 +76176,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -76856,6 +76859,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
@@ -77186,7 +77190,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@@ -77265,7 +77270,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({

dist/demo.js

@@ -2073,6 +2073,10 @@ BI.shortcut("demo.lazy_loader", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
         var self = this;
         BI.createWidget({
             type: "bi.select_list",
+            toolbar: {
+                type: "bi.multi_select_bar",
+                iconWrapperWidth: 26
+            },
             element: this,
             el: {
                 el: {
@@ -6126,7 +6130,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
         };
     }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);/**
+BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-absolute"
+    },
+    render: function () {
+        return {
+            type: "bi.inline_vertical_adapt",
+            items: [{
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 200
+            }, {
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 100
+            }]
+        };
+    }
+});
+BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
  * Created by User on 2017/3/22.
  */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

dist/fineui.ie.js

@@ -73439,6 +73439,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
 BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
     props: {
+        baseCls: "bi-number-interval-single-editor",
         tipType: "success",
         title: ""
     },
@@ -75746,6 +75747,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -76015,6 +76017,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -76697,6 +76700,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
@@ -77027,7 +77031,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@@ -77106,7 +77111,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({

dist/fineui.js

@@ -73843,6 +73843,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
 BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
     props: {
+        baseCls: "bi-number-interval-single-editor",
         tipType: "success",
         title: ""
     },
@@ -76150,6 +76151,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -76419,6 +76421,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -77101,6 +77104,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
@@ -77431,7 +77435,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@@ -77510,7 +77515,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({

dist/fineui_without_jquery_polyfill.js

@@ -56657,6 +56657,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
 BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
     props: {
+        baseCls: "bi-number-interval-single-editor",
         tipType: "success",
         title: ""
     },
@@ -58964,6 +58965,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -59233,6 +59235,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -59915,6 +59918,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
@@ -60245,7 +60249,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@@ -60324,7 +60329,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({

dist/widget.js

@@ -14173,6 +14173,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
 BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
     props: {
+        baseCls: "bi-number-interval-single-editor",
         tipType: "success",
         title: ""
     },
@@ -16480,6 +16481,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -16749,6 +16751,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 
@@ -17431,6 +17434,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
@@ -17761,7 +17765,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@@ -17840,7 +17845,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({

src/widget/singleselect/singleselect.combo.js

@@ -43,6 +43,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 

src/widget/singleselect/singleselect.insert.combo.js

@@ -43,6 +43,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
                     callback.apply(self, arguments);
                 });
             },
+            text: o.text,
             value: this.storeValue
         });
 

src/widget/singleselect/singleselect.trigger.js

@@ -36,6 +36,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
 
         this.searcher = BI.createWidget(o.searcher, {
             type: "bi.single_select_searcher",
+            text: o.text,
             height: o.height,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,

src/widget/singleselect/trigger/editor.singleselect.js

@@ -22,7 +22,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: BI.i18nText("BI-Basic_Search"),
             allowBlank: true,
-            value: o.value
+            value: o.value,
+            text: o.text
         });
 
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {

src/widget/singleselect/trigger/searcher.singleselect.js

@@ -23,7 +23,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.single_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
         });
 
         this.searcher = BI.createWidget({