Browse Source

Pull request #50: BI-69245 fix: IE弹框

Merge in PG2/plugin-bi-screen-adaptive from ~FAY/plugin-bi-screen-adaptive:persist/10.0 to persist/10.0

* commit 'd6f3758f84507ad84d26ac610b461fc8c9d0d529':
  BI-69245 fix: IE弹框
persist/10.0
fay 5 years ago
parent
commit
e1a31cab45
  1. 2
      src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js
  2. 2
      src/main/resources/com/finebi/plugin/web/scripts/entry.js

2
src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js

@ -311,7 +311,7 @@
this.popupView.element[0].style.left = parseInt(pBounds.left) + "px";
}else if (parseInt(cBounds.top) >= parseInt(pBounds.top) && parseInt(cBounds.left) < parseInt(pBounds.left)) {
this.popupView.element[0].style.top = parseInt(pBounds.bottom) + "px";
this.popupView.element[0].style.left = parseInt(Math.min(pBounds.left, body.clientWidth - cBounds.width)) - transformX + "px";
this.popupView.element[0].style.left = parseInt(Math.min(pBounds.left, body.clientWidth - cBounds.width)) + "px";
} else {
this.popupView.element[0].style.top = parseInt(pBounds.bottom) + "px";
this.popupView.element[0].style.left = parseInt(cBounds.left) * scale + "px";

2
src/main/resources/com/finebi/plugin/web/scripts/entry.js

@ -311,7 +311,7 @@
this.popupView.element[0].style.left = parseInt(pBounds.left) + "px";
}else if (parseInt(cBounds.top) >= parseInt(pBounds.top) && parseInt(cBounds.left) < parseInt(pBounds.left)) {
this.popupView.element[0].style.top = parseInt(pBounds.bottom) + "px";
this.popupView.element[0].style.left = parseInt(Math.min(pBounds.left, body.clientWidth - cBounds.width)) - transformX + "px";
this.popupView.element[0].style.left = parseInt(Math.min(pBounds.left, body.clientWidth - cBounds.width)) + "px";
} else {
this.popupView.element[0].style.top = parseInt(pBounds.bottom) + "px";
this.popupView.element[0].style.left = parseInt(cBounds.left) * scale + "px";

Loading…
Cancel
Save