Browse Source

Merge pull request #119838 in DEC/fineui from master to feature/x

* commit 'ced17523f4739e1ee6d880446be1e4ea2f50a0a5':
  auto upgrade version to 2.0.20220726185509
  DESIGN-5 style: 【2022】气泡的边距统一调整
es6
superman 2 years ago
parent
commit
345f935dd8
  1. 2
      package.json
  2. 30
      src/case/combo/bubblecombo/popup.bubble.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20220726155349", "version": "2.0.20220726185509",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

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

Loading…
Cancel
Save