Browse Source

Pull request #2384: 无JIRA任务 chore: update

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

* commit 'cd1a1781caa76334268df8bc908caecd680c7ae4':
  chore: update
es6
guy 3 years ago
parent
commit
043af24230
  1. 6
      src/case/combo/bubblecombo/combo.bubble.js
  2. 2
      src/case/combo/bubblecombo/popup.bubble.js

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

@ -54,8 +54,10 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
offsetStyle: o.offsetStyle, offsetStyle: o.offsetStyle,
el: o.el, el: o.el,
popup: BI.extend({ popup: BI.extend({
type: "bi.bubble_popup_view" type: "bi.bubble_popup_view",
}, o.popup) }, o.popup, {
cls: (o.popup.cls || "") + " bi-zoom-big-enter bi-zoom-big-enter-active"
})
}); });
this.combo.on(BI.Combo.EVENT_TRIGGER_CHANGE, function () { this.combo.on(BI.Combo.EVENT_TRIGGER_CHANGE, function () {
self.fireEvent(BI.BubbleCombo.EVENT_TRIGGER_CHANGE, arguments); self.fireEvent(BI.BubbleCombo.EVENT_TRIGGER_CHANGE, arguments);

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

@ -8,7 +8,7 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () { _defaultConfig: function () {
var config = BI.BubblePopupView.superclass._defaultConfig.apply(this, arguments); var config = BI.BubblePopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(config, { return BI.extend(config, {
baseCls: config.baseCls + " bi-bubble-popup-view bi-zoom-big-enter bi-zoom-big-enter-active", baseCls: config.baseCls + " bi-bubble-popup-view",
minWidth: 220, minWidth: 220,
maxWidth: 300, maxWidth: 300,
minHeight: 90 minHeight: 90

Loading…
Cancel
Save