diff --git a/packages/fineui/src/core/utils/dom.js b/packages/fineui/src/core/utils/dom.js index 52af3c798..552a60d44 100644 --- a/packages/fineui/src/core/utils/dom.js +++ b/packages/fineui/src/core/utils/dom.js @@ -1,9 +1,10 @@ /** * 对DOM操作的通用函数 */ -import { Widget } from "../4.widget" +import { Widget } from "../4.widget"; import { each, isEmpty, isNull, isNotNull } from "../2.base"; import $ from "jquery"; +import { isIE } from "./../platform"; export function ready(fn) { Widget._renderEngine.createElement(document).ready(fn); @@ -65,10 +66,10 @@ export function preloadImages(srcArray, onload) { each(srcArray, (i, src) => { images[i] = new Image(); images[i].src = src; - images[i].onload = function () { + images[i].onload = function() { complete(); }; - images[i].onerror = function () { + images[i].onerror = function() { complete(); }; }); @@ -104,7 +105,7 @@ export function getTextSizeHeight(text, fontSize = 12) { let _scrollWidth = null; export function getScrollWidth(css) { - if (isNull(_scrollWidth) || isNotNull(css) || _scrollWidth === 0) { + if (isNull(_scrollWidth) || isNotNull(css) || _scrollWidth === 0) { const ul = Widget._renderEngine.createElement("
").width(50).height(50) .css({ position: "absolute", @@ -751,7 +752,7 @@ export function getComboPosition(combo, popup, extraWidth, extraHeight, needAdap * 获取position:fixed相对定位的元素 */ export function getPositionRelativeContainingBlock(element) { - if (["html", "body", "#document"].indexOf((element.nodeName || "").toLowerCase()) >= 0) { + if (isIE() || ["html", "body", "#document"].indexOf((element.nodeName || "").toLowerCase()) >= 0) { // $FlowFixMe[incompatible-return]: assume body is always available return element.ownerDocument.body; }