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

* commit '7c8274ff99bfcfc6a3be84fe4f95c9fb1f259570':
  BI-104282 fix:switch初始状态文字显示控制增加selected判断

src/case/button/switch.js

@@ -36,14 +36,14 @@ BI.Switch = BI.inherit(BI.BasicButton, {
                 width: 12,
                 height: 12,
                 top: tgap,
-                left: this.options.selected ? 28 : 4
+                left: o.selected ? 28 : 4
             }, {
                 type: "bi.label",
                 text: BI.i18nText("BI-Basic_Simple_Open"),
                 cls: "content-tip",
                 left: 8,
                 top: tgap - 2,
-                invisible: !o.showTip,
+                invisible: !(o.showTip && o.selected),
                 ref: function (ref) {
                     self.openTip = ref;
                 }
@@ -53,7 +53,7 @@ BI.Switch = BI.inherit(BI.BasicButton, {
                 cls: "content-tip",
                 right: 8,
                 top: tgap - 2,
-                invisible: !o.showTip,
+                invisible: !(o.showTip && !o.selected),
                 ref: function (ref) {
                     self.closeTip = ref;
                 }