Browse Source

Pull request #210979: Release/11.0

Merge in DEC/fineui from ~DAILER/fineui-decision:release/11.0 to release/11.0

* commit 'cf042be6128cd838dd27eb5a714153df74cd742d':
  BI-118434  fix: 临时解决一下belowMouse
  auto upgrade version to 2.0.20221208185443
  auto upgrade version to 2.0.20221208183344
  auto upgrade version to 2.0.20221208181750
  KERNEL-11877 feat: container支持函数, 修复错误
master
Dailer-刘荣歆 2 years ago
parent
commit
564ca3e7ce
  1. 2
      package.json
  2. 3
      src/base/combination/combo.js

2
package.json

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

3
src/base/combination/combo.js

@ -196,6 +196,7 @@
this.popupView.visible();
var combo = (o.belowMouse && BI.isNotNull(e)) ? {
element: {
0: e.target,
offset: function () {
return {
left: e.pageX,
@ -219,7 +220,7 @@
},
},
} : this.combo;
var positionRelativeElement = o.supportCSSTransform ? BI.DOM.getPositionRelativeContainingBlock(BI.Widget._renderEngine.createElement(BI.isFunction(o.container) ? o.container() : o.container)[0]) : null;
var positionRelativeElement = o.supportCSSTransform ? BI.DOM.getPositionRelativeContainingBlock(BI.isNull(o.container) ? this.element[0] : BI.Widget._renderEngine.createElement(BI.isFunction(o.container) ? o.container() : o.container)[0]) : null;
switch (o.direction) {
case "bottom":
case "bottom,right":

Loading…
Cancel
Save