From 3a4da68ab19c6a02d54e716abe7f91836a02a01c Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 9 Jul 2019 14:23:58 +0800
Subject: [PATCH] =?UTF-8?q?BI-47577=20fix:=20IE9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8E=BB=E5=9C=86=E8=A7=92=20&&=20bubblepopup=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/button/button.basic.js     |  2 +-
 src/case/combo/bubblecombo/popup.bubble.js | 12 ++++++++----
 src/css/base/single/button/button.css      |  6 ++++++
 src/less/base/single/button/button.less    |  3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js
index bfc1090c9..ae6ee758f 100644
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@@ -9,7 +9,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
     _defaultConfig: function () {
         var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
+            _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
             value: "",
             text: "",
             stopEvent: false,
diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js
index 882537f76..c722d9d56 100644
--- a/src/case/combo/bubblecombo/popup.bubble.js
+++ b/src/case/combo/bubblecombo/popup.bubble.js
@@ -32,9 +32,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
         return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
             extraCls: "bi-bubble-bar-popup-view",
             buttons: [{
-                value: BI.i18nText("BI-Basic_Cancel"),
+                value: false,
+                text: BI.i18nText("BI-Basic_Cancel"),
                 ghost: true
-            }, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}]
+            }, {
+                text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
+                value: true
+            }]
         });
     },
     _init: function () {
@@ -124,7 +128,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
                 type: "bi.button",
                 height: 24,
                 handler: function (v) {
-                    self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v);
+                    self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
                 }
             }, buttonOpt);
 
@@ -151,5 +155,5 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
         this.text.setText(v || this.options.text);
     }
 });
-BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
+BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
 BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
diff --git a/src/css/base/single/button/button.css b/src/css/base/single/button/button.css
index 96bf495a1..22dfb1ea2 100644
--- a/src/css/base/single/button/button.css
+++ b/src/css/base/single/button/button.css
@@ -23,6 +23,12 @@ body .bi-button,
   vertical-align: middle;
   cursor: pointer;
 }
+body .bi-button.hack,
+#body .bi-button.hack {
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  border-radius: 0px;
+}
 body .bi-button.block,
 #body .bi-button.block {
   font-size: inherit;
diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less
index 6a8ffb924..32c6fa272 100644
--- a/src/less/base/single/button/button.less
+++ b/src/less/base/single/button/button.less
@@ -3,6 +3,9 @@
 @activeVal: transform .5s ease, opacity 1s ease;
 @activeStopVal: transform 0s;
 body .bi-button, #body .bi-button {
+  &.hack {
+    .border-radius(0px);
+  }
   .border-radius(2px);
   border: 1px solid @color-bi-border-highlight;
   background-color: @color-bi-background-highlight;