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

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

* commit '90363dce9c0cd0ddf14d99e61b896d9e21e4aae7':
  feature: 气泡支持品牌色
  feature: 气泡支持品牌色

jsy.lessconfig.json

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

src/base/combination/combo.js

@@ -144,7 +144,7 @@
             delete needHideWhenAnotherComboOpen[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());
             this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
         },
@@ -170,11 +170,11 @@
 
             this.element.addClass(this.options.comboClass);
             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());
 
             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));
             this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
         },

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
             isDefaultInit: false,
             destroyWhenHide: false,
+            hideWhenClickOutside: true,
             hideWhenBlur: true,
             isNeedAdjustHeight: true, // 是否需要高度调整
             isNeedAdjustWidth: true,
@@ -43,6 +44,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             direction: o.direction,
             isDefaultInit: o.isDefaultInit,
             hideWhenBlur: o.hideWhenBlur,
+            hideWhenClickOutside: o.hideWhenClickOutside,
             destroyWhenHide: o.destroyWhenHide,
             hideWhenAnotherComboOpen: o.hideWhenAnotherComboOpen,
             isNeedAdjustHeight: o.isNeedAdjustHeight,