Browse Source

Pull request #2942: DESIGN-5 style: 【2022】气泡的边距统一调整

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

* commit '6e7c59297e470830ab81a4d8b19a3777336a6fa4':
  DESIGN-5 style: 【2022】气泡的边距统一调整
es6
Dailer 2 years ago
parent
commit
22e3c053ce
  1. 28
      src/case/combo/bubblecombo/popup.bubble.js

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

@ -36,7 +36,9 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
}, {
text: BI.i18nText(BI.i18nText("BI-Basic_OK")),
value: true
}]
}],
innerVgap: 16,
innerHgap: 16,
});
},
@ -48,8 +50,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
if (BI.isWidget(buttonOpt)) {
items.push({
el: buttonOpt,
lgap: i === 0 ? 15 : 10,
rgap: i === o.buttons.length - 1 ? 15 : 0
lgap: 12,
});
} else {
items.push({
@ -60,14 +61,14 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v);
}
}, buttonOpt),
lgap: i === 0 ? 15 : 10,
rgap: i === o.buttons.length - 1 ? 15 : 0
lgap: 12,
});
}
});
return BI.createWidget({
type: "bi.right_vertical_adapt",
height: 44,
innerVgap: o.innerVgap,
innerHgap: o.innerHgap,
items: items
});
},
@ -79,20 +80,17 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
_createView: function () {
var o = this.options;
var button = BI.createWidget({
type: "bi.button_group",
items: [this._createContent()],
layouts: [{
var view = BI.createWidget({
type: "bi.vertical",
items: [this._createContent()],
cls: "bar-popup-container",
hgap: BI.SIZE_CONSANTS.H_GAP_SIZE,
tgap: BI.SIZE_CONSANTS.V_GAP_SIZE
}]
hgap: o.innerHgap,
tgap: o.innerVgap,
});
button.element.css("min-height", o.minHeight - 44);
view.element.css("min-height", o.minHeight);
return button;
return view;
}
});
BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON = "EVENT_CLICK_TOOLBAR_BUTTON";

Loading…
Cancel
Save