Browse Source

BI-61373 fix: 插件造成模板位置问题

release/10.0
fay 5 years ago
parent
commit
9d50ad12ec
  1. 6
      src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js
  2. 6
      src/main/resources/com/finebi/plugin/web/scripts/entry.js

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

@ -203,7 +203,7 @@
} }
offsetLeft -= elm.scrollLeft || 0; offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0; offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode; elm = elm.offsetParent;
} while( elm ); } while( elm );
} }
win = getWindow( doc ); win = getWindow( doc );
@ -221,8 +221,8 @@
adjustHeight.call(this, e); adjustHeight.call(this, e);
if (this.popupView) { if (this.popupView) {
if (!checkInPopupView(this.popupView.element[0])) { if (!checkInPopupView(this.popupView.element[0])) {
this.popupView.element[0].style.left = parseInt(this.popupView.element[0].style.left) * scale + "px"; this.popupView.element[0].style.left = (parseInt(this.popupView.element[0].style.left) * scale - document.body.scrollLeft) + "px";
this.popupView.element[0].style.top = parseInt(this.popupView.element[0].style.top) * scale + transformY + "px"; this.popupView.element[0].style.top = (parseInt(this.popupView.element[0].style.top) * scale + transformY - document.body.scrollTop) + "px";
} else { } else {
} }

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

@ -203,7 +203,7 @@
} }
offsetLeft -= elm.scrollLeft || 0; offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0; offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode; elm = elm.offsetParent;
} while( elm ); } while( elm );
} }
win = getWindow( doc ); win = getWindow( doc );
@ -221,8 +221,8 @@
adjustHeight.call(this, e); adjustHeight.call(this, e);
if (this.popupView) { if (this.popupView) {
if (!checkInPopupView(this.popupView.element[0])) { if (!checkInPopupView(this.popupView.element[0])) {
this.popupView.element[0].style.left = parseInt(this.popupView.element[0].style.left) * scale + "px"; this.popupView.element[0].style.left = (parseInt(this.popupView.element[0].style.left) * scale - document.body.scrollLeft) + "px";
this.popupView.element[0].style.top = parseInt(this.popupView.element[0].style.top) * scale + transformY + "px"; this.popupView.element[0].style.top = (parseInt(this.popupView.element[0].style.top) * scale + transformY - document.body.scrollTop) + "px";
} else { } else {
} }

Loading…
Cancel
Save