From 88047c885d2c6d6a33c89edc8802733ddaa9be68 Mon Sep 17 00:00:00 2001
From: fay <lfhlifenghao@gmail.com>
Date: Thu, 21 May 2020 14:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                                    | 3 ++-
 .../resources/com/finebi/plugin/web/plugin.screen_adaptive.js | 4 ++--
 src/main/resources/com/finebi/plugin/web/scripts/entry.js     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 619eda5..1152162 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,12 +3,13 @@
     <id>com.finebi.plugin.screenadaptive</id>
     <name><![CDATA[BI模板屏幕自适应(v5.1.2)]]></name>
     <active>yes</active>
-    <version>1.1.34</version>
+    <version>1.1.35</version>
     <env-version>10.0</env-version>
     <jartime>2019-08-16</jartime>
     <vendor>fay</vendor>
     <description><![CDATA[预览BI模板时，根据屏幕的宽度自适应显示模板]]></description>
     <change-notes><![CDATA[
+        [2020-05-21]解决部分情况下图表模糊的情况<br/>
         [2020-05-09]修复IE中有空白部分的情况<br/>
         [2019-10-24]修复IE中有空白部分的情况<br/>
         [2019-08-28]为BI模板添加模板自适应功能。<br/>
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;
     }
 
     // 获取缩放倍数，原模板宽高