Merge pull request #112555 in DEC/fineui from master to feature/x

* commit '5003688e974845bebe3a3bb7fcdfe638bf7d4340':
  无JIRA fix: titile问题

src/base/single/0.single.js

@@ -35,7 +35,7 @@ BI.Single = BI.inherit(BI.Widget, {
         } else {
             tooltipOpt.level = this.getTipType() || "success";
             //  由于以前的用法,存在大量disabled:true搭配warningTitle的情况,所以这里做一个兼容,disabled:true的情况下,依然优先显示warningTitle,避免只设置了warningTitle而没有设置title的情况
-            if (BI.isNull(o.tipType && !this.isEnabled())) {
+            if (BI.isNull(o.tipType) && !this.isEnabled()) {
                 tooltipOpt.text = (this.getWarningTitle() || title);
             } else {
                 tooltipOpt.text = tooltipOpt.level === "success" ? title : (this.getWarningTitle() || title);

src/base/single/button/buttons/button.js

@@ -112,12 +112,12 @@
                     tgap: o.iconPosition === "top" ? o.iconGap : 0,
                     bgap: o.iconPosition === "bottom" ? o.iconGap : 0
                 };
-                var items = [this.icon, BI.extend({el: this.text}, gapContainer)];
+                var items = [this.icon, BI.extend({ el: this.text }, gapContainer)];
                 if (isVertical(o.iconPosition)) {
                     layoutType = "bi.vertical";
                 }
                 if (o.iconPosition === "right" || o.iconPosition === "bottom") {
-                    items = [BI.extend({el: this.text}, gapContainer), this.icon];
+                    items = [BI.extend({ el: this.text }, gapContainer), this.icon];
                 }
                 BI.createWidget({
                     type: "bi.center_adapt",
@@ -147,7 +147,8 @@
                     rgap: o.rgap,
                     element: this,
                     text: o.text,
-                    value: o.value
+                    value: o.value,
+                    title: null,
                 });
             }
             var classArr = ["block", "clear", "ghost", "plain", "loading", "light"];
@@ -159,7 +160,7 @@
             });
 
             if (o.minWidth > 0) {
-                this.element.css({"min-width": o.minWidth / BI.pixRatio + BI.pixUnit});
+                this.element.css({ "min-width": o.minWidth / BI.pixRatio + BI.pixUnit });
             }
         },