diff --git a/plugin.xml b/plugin.xml index e3bad33..6a176f7 100644 --- a/plugin.xml +++ b/plugin.xml @@ -3,12 +3,13 @@ com.finebi.plugin.screenadaptive yes - 1.1.34 + 1.1.35 10.0 2019-08-16 fay [2020-05-09]修复IE中有空白部分的情况
[2019-10-24]修复IE中有空白部分的情况
[2019-08-28]为BI模板添加模板自适应功能。
diff --git a/src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js b/src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js index 04b617d..60fc9f3 100644 --- a/src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js +++ b/src/main/resources/com/finebi/plugin/web/plugin.screen_adaptive.js @@ -74,7 +74,7 @@ fixedWrapper.style.height = bounds.height * scale + "px"; } - window.scale = window.devicePixelRatio * scale; + window.scale = Math.max(window.devicePixelRatio * scale, 1); } // 取消缩放 @@ -98,7 +98,7 @@ fixedWrapper.style.height = "100%"; scale = 1; - window.scale = window.devicePixelRatio / scale; + window.scale = window.devicePixelRatio; } // 获取缩放倍数,原模板宽高 diff --git a/src/main/resources/com/finebi/plugin/web/scripts/entry.js b/src/main/resources/com/finebi/plugin/web/scripts/entry.js index 04b617d..60fc9f3 100644 --- a/src/main/resources/com/finebi/plugin/web/scripts/entry.js +++ b/src/main/resources/com/finebi/plugin/web/scripts/entry.js @@ -74,7 +74,7 @@ fixedWrapper.style.height = bounds.height * scale + "px"; } - window.scale = window.devicePixelRatio * scale; + window.scale = Math.max(window.devicePixelRatio * scale, 1); } // 取消缩放 @@ -98,7 +98,7 @@ fixedWrapper.style.height = "100%"; scale = 1; - window.scale = window.devicePixelRatio / scale; + window.scale = window.devicePixelRatio; } // 获取缩放倍数,原模板宽高