无JIRA任务 确定取消调整高度后，masker偏移要调一下

demo/js/base/demo.label.js

@@ -7,132 +7,8 @@ Demo.Label = BI.inherit(BI.Widget, {
             type: "bi.vertical",
             items: [{
                 type: "bi.label",
-                cls: "layout-bg6",
+                text: "1"
-                text: "这是一个label控件，默认居中",
+            }]
-                disabled: true,
-                textAlign: "center"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "这是一个label控件, 高度为30，默认居中",
-                textAlign: "center",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg3",
-                text: "这是一个label控件，使用水平居左",
-                textAlign: "left",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg2",
-                text: "这是一个label控件，whiteSpace是normal，不设置高度，为了演示这个是真的是normal的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg5",
-                text: "这是一个label控件，whiteSpace是默认的nowrap，不设置高度，为了演示这个是真的是nowrap的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg7",
-                text: "这是一个label控件，whiteSpace是默认的nowrap，高度为30，为了演示这个是真的是nowrap的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg3",
-                text: "这是一个label控件，whiteSpace设置为normal，高度为60，为了演示这个是真的是normal的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal",
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg5",
-                text: "这是一个label控件，whiteSpace设置为normal，textHeight控制text的lineHeight，这样可以实现换行效果，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal",
-                textHeight: 30,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "这是一个label控件，whiteSpace设置为nowrap，textWidth控制text的width",
-                textWidth: 200,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg8",
-                text: "这是一个label控件，whiteSpace设置为normal，textWidth控制text的width，这样可以实现换行效果，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal",
-                textWidth: 200,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg7",
-                text: "whiteSpace为默认的nowrap，高度设置为60，宽度设置为300",
-                height: 60,
-                width: 300
-            }, {
-                type: "bi.label",
-                cls: "layout-bg6",
-                text: "设置了宽度300，高度60，whiteSpace设置为normal",
-                whiteSpace: "normal",
-                width: 300,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg8",
-                text: "textWidth设置为200，textHeight设置为30，width设置300，凑点字数看效果",
-                width: 300,
-                textWidth: 200,
-                textHeight: 30,
-                height: 60,
-                whiteSpace: "normal"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "textWidth设置为200，width设置300，看下水平居左的换行效果",
-                textAlign: "left",
-                width: 300,
-                textWidth: 200,
-                textHeight: 30,
-                height: 60,
-                whiteSpace: "normal"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg2",
-                text: "使用默认的nowrap，再去设置textHeight，只会有一行的效果",
-                textAlign: "left",
-                width: 300,
-                textWidth: 200,
-                textHeight: 30,
-                height: 60
-            }, {
-                type: "bi.left",
-                items: [{
-                    type: "bi.label",
-                    cls: "layout-bg3",
-                    text: "在float布局中自适应的,不设高度和宽度，文字多长这个就有多长"
-                }],
-                height: 30
-            }, {
-                type: "bi.left",
-                items: [{
-                    type: "bi.label",
-                    cls: "layout-bg4",
-                    text: "在float布局中自适应的，设置了宽度200，后面还有",
-                    width: 200
-                }],
-                height: 30
-            }, {
-                type: "bi.left",
-                items: [{
-                    type: "bi.label",
-                    text: "在float布局中自适应的，设置了高度，文字多长这个就有多长",
-                    cls: "layout-bg5",
-                    height: 30
-                }],
-                height: 30
-            }],
-            hgap: 300,
-            vgap: 20
         };
     }
 });

dist/bundle.ie.js

@@ -66721,9 +66721,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -66737,7 +66737,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67125,7 +67125,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67508,7 +67508,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -71076,7 +71076,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -71182,7 +71182,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 
@@ -72723,7 +72723,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {

dist/bundle.js

@@ -67125,9 +67125,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -67141,7 +67141,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67529,7 +67529,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67912,7 +67912,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -71480,7 +71480,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -71586,7 +71586,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 
@@ -73127,7 +73127,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {

dist/demo.js

@@ -347,132 +347,8 @@ BI.shortcut("demo.icon_label", Demo.IconLabel);Demo.Label = BI.inherit(BI.Widget
             type: "bi.vertical",
             items: [{
                 type: "bi.label",
-                cls: "layout-bg6",
+                text: "1"
-                text: "这是一个label控件，默认居中",
+            }]
-                disabled: true,
-                textAlign: "center"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "这是一个label控件, 高度为30，默认居中",
-                textAlign: "center",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg3",
-                text: "这是一个label控件，使用水平居左",
-                textAlign: "left",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg2",
-                text: "这是一个label控件，whiteSpace是normal，不设置高度，为了演示这个是真的是normal的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg5",
-                text: "这是一个label控件，whiteSpace是默认的nowrap，不设置高度，为了演示这个是真的是nowrap的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg7",
-                text: "这是一个label控件，whiteSpace是默认的nowrap，高度为30，为了演示这个是真的是nowrap的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg3",
-                text: "这是一个label控件，whiteSpace设置为normal，高度为60，为了演示这个是真的是normal的，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal",
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg5",
-                text: "这是一个label控件，whiteSpace设置为normal，textHeight控制text的lineHeight，这样可以实现换行效果，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal",
-                textHeight: 30,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "这是一个label控件，whiteSpace设置为nowrap，textWidth控制text的width",
-                textWidth: 200,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg8",
-                text: "这是一个label控件，whiteSpace设置为normal，textWidth控制text的width，这样可以实现换行效果，我凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数，凑点字数",
-                whiteSpace: "normal",
-                textWidth: 200,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg7",
-                text: "whiteSpace为默认的nowrap，高度设置为60，宽度设置为300",
-                height: 60,
-                width: 300
-            }, {
-                type: "bi.label",
-                cls: "layout-bg6",
-                text: "设置了宽度300，高度60，whiteSpace设置为normal",
-                whiteSpace: "normal",
-                width: 300,
-                height: 60
-            }, {
-                type: "bi.label",
-                cls: "layout-bg8",
-                text: "textWidth设置为200，textHeight设置为30，width设置300，凑点字数看效果",
-                width: 300,
-                textWidth: 200,
-                textHeight: 30,
-                height: 60,
-                whiteSpace: "normal"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "textWidth设置为200，width设置300，看下水平居左的换行效果",
-                textAlign: "left",
-                width: 300,
-                textWidth: 200,
-                textHeight: 30,
-                height: 60,
-                whiteSpace: "normal"
-            }, {
-                type: "bi.label",
-                cls: "layout-bg2",
-                text: "使用默认的nowrap，再去设置textHeight，只会有一行的效果",
-                textAlign: "left",
-                width: 300,
-                textWidth: 200,
-                textHeight: 30,
-                height: 60
-            }, {
-                type: "bi.left",
-                items: [{
-                    type: "bi.label",
-                    cls: "layout-bg3",
-                    text: "在float布局中自适应的,不设高度和宽度，文字多长这个就有多长"
-                }],
-                height: 30
-            }, {
-                type: "bi.left",
-                items: [{
-                    type: "bi.label",
-                    cls: "layout-bg4",
-                    text: "在float布局中自适应的，设置了宽度200，后面还有",
-                    width: 200
-                }],
-                height: 30
-            }, {
-                type: "bi.left",
-                items: [{
-                    type: "bi.label",
-                    text: "在float布局中自适应的，设置了高度，文字多长这个就有多长",
-                    cls: "layout-bg5",
-                    height: 30
-                }],
-                height: 30
-            }],
-            hgap: 300,
-            vgap: 20
         };
     }
 });

dist/fineui.ie.js

@@ -66963,9 +66963,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -66979,7 +66979,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67367,7 +67367,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67750,7 +67750,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -71318,7 +71318,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -71424,7 +71424,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 
@@ -72965,7 +72965,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {

dist/fineui.js

@@ -67367,9 +67367,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -67383,7 +67383,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -67771,7 +67771,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -68154,7 +68154,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -71722,7 +71722,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -71828,7 +71828,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 
@@ -73369,7 +73369,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {

dist/fineui_without_jquery_polyfill.js

@@ -50204,9 +50204,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -50220,7 +50220,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -50608,7 +50608,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -50991,7 +50991,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -54559,7 +54559,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -54665,7 +54665,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 
@@ -56206,7 +56206,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {

dist/widget.js

@@ -8476,9 +8476,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -8492,7 +8492,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -8880,7 +8880,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -9263,7 +9263,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,
@@ -12831,7 +12831,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -12937,7 +12937,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 
@@ -14478,7 +14478,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {

src/widget/multiselect/multiselect.combo.js

@@ -27,9 +27,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
         this.storeValue = o.value || {};
-        
+
         this._assertValue(this.storeValue);
-        
+
         // 标记正在请求数据
         this.requesting = false;
 
@@ -43,7 +43,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,

src/widget/multiselect/multiselect.insert.combo.js

@@ -40,7 +40,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -43,7 +43,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             valueFormatter: o.valueFormatter,

src/widget/multitree/multi.tree.combo.js

@@ -11,7 +11,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             top: 0,
             left: 0,
             right: 0,
-            bottom: 31
+            bottom: 25
         }
     },
 
@@ -117,7 +117,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 return triggerBtn.element.find(e.target).length === 0;
             }
         });
-        
+
         var change = false;
         var clear = false;          // 标识当前是否点击了清空
 

src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@@ -42,7 +42,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     left: 0,
                     top: 0,
                     right: 0,
-                    bottom: 26
+                    bottom: 25
                 }
             },
             allValueGetter: function () {