Browse Source

BI-47577 fix: IE9按钮去圆角 && bubblepopup事件规范

es6
windy 5 years ago
parent
commit
3a4da68ab1
  1. 2
      src/base/single/button/button.basic.js
  2. 12
      src/case/combo/bubblecombo/popup.bubble.js
  3. 6
      src/css/base/single/button/button.css
  4. 3
      src/less/base/single/button/button.less

2
src/base/single/button/button.basic.js

@ -9,7 +9,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,

12
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), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -124,7 +128,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -151,5 +155,5 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); 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); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);

6
src/css/base/single/button/button.css

@ -23,6 +23,12 @@ body .bi-button,
vertical-align: middle; vertical-align: middle;
cursor: pointer; 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,
#body .bi-button.block { #body .bi-button.block {
font-size: inherit; font-size: inherit;

3
src/less/base/single/button/button.less

@ -3,6 +3,9 @@
@activeVal: transform .5s ease, opacity 1s ease; @activeVal: transform .5s ease, opacity 1s ease;
@activeStopVal: transform 0s; @activeStopVal: transform 0s;
body .bi-button, #body .bi-button { body .bi-button, #body .bi-button {
&.hack {
.border-radius(0px);
}
.border-radius(2px); .border-radius(2px);
border: 1px solid @color-bi-border-highlight; border: 1px solid @color-bi-border-highlight;
background-color: @color-bi-background-highlight; background-color: @color-bi-background-highlight;

Loading…
Cancel
Save