Browse Source

Pull request #2436: feature: 气泡支持品牌色

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '90363dce9c0cd0ddf14d99e61b896d9e21e4aae7':
  feature: 气泡支持品牌色
  feature: 气泡支持品牌色
es6
guy 3 years ago
parent
commit
0e123b484f
  1. 3
      jsy.lessconfig.json
  2. 6
      src/base/combination/combo.js
  3. 2
      src/case/combo/bubblecombo/combo.bubble.js

3
jsy.lessconfig.json

@ -1,4 +1,5 @@
{ {
"@background-color-primary": "#003D4D",
"@color-primary": "#00acbe", "@color-primary": "#00acbe",
"font-color-normal": "#0d1540", "font-color-normal": "#0d1540",
"font-color-light-gray": "#0d1540", "font-color-light-gray": "#0d1540",
@ -17,4 +18,4 @@
"border-color-disabled": "#e8eaed", "border-color-disabled": "#e8eaed",
"border-color-success": "#28b668", "border-color-success": "#28b668",
"border-color-negative": "#e65251" "border-color-negative": "#e65251"
} }

6
src/base/combination/combo.js

@ -144,7 +144,7 @@
delete needHideWhenAnotherComboOpen[this.getName()]; delete needHideWhenAnotherComboOpen[this.getName()];
delete currentOpenedCombos[this.getName()]; delete currentOpenedCombos[this.getName()];
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -170,11 +170,11 @@
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
BI.Widget._renderEngine.createElement(document).unbind("mousewheel." + this.getName()); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousewheel." + this.getName());
BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
BI.Widget._renderEngine.createElement(document).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).bind("blur." + this.getName(), BI.bind(this._hideIf, this)); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).bind("blur." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },

2
src/case/combo/bubblecombo/combo.bubble.js

@ -17,6 +17,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
isDefaultInit: false, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
hideWhenClickOutside: true,
hideWhenBlur: true, hideWhenBlur: true,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整
isNeedAdjustWidth: true, isNeedAdjustWidth: true,
@ -43,6 +44,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
direction: o.direction, direction: o.direction,
isDefaultInit: o.isDefaultInit, isDefaultInit: o.isDefaultInit,
hideWhenBlur: o.hideWhenBlur, hideWhenBlur: o.hideWhenBlur,
hideWhenClickOutside: o.hideWhenClickOutside,
destroyWhenHide: o.destroyWhenHide, destroyWhenHide: o.destroyWhenHide,
hideWhenAnotherComboOpen: o.hideWhenAnotherComboOpen, hideWhenAnotherComboOpen: o.hideWhenAnotherComboOpen,
isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustHeight: o.isNeedAdjustHeight,

Loading…
Cancel
Save