From 2a47a15f56553a50a05eec44ae0a87a8b5289c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Mon, 24 Aug 2020 11:20:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-15259=20release=E2=86=92final?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/chart/ChartIcon.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java
index 16e13db70b..3ae8f0b848 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java
@@ -1,12 +1,12 @@
 package com.fr.design.chart;
 
+import com.fr.base.ScreenResolution;
 import com.fr.base.chart.BaseChartPainter;
 import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.chart.result.WebChartIDInfo;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
-import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.script.Calculator;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLable;
@@ -79,7 +79,8 @@ public class ChartIcon implements Icon, XMLable {
 
         BaseChartPainter chartPainter = getChartPainter();
 
-        int resolution = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getJTemplateResolution();
+        //插入图表的宽度是固定的，resolution直接获取屏幕分辨率，resolution现在只会影响到老图表
+        int resolution = ScreenResolution.getScreenResolution();
 
         Graphics2D g2d = (Graphics2D) g;
         Paint oldPaint = g2d.getPaint();

From 1769463d65de0fc421000347e3294f994da04b77 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Mon, 24 Aug 2020 13:54:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-37869=20=E5=85=B1=E5=88=9B=20?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1-=E6=96=AD=E5=BC=80?=
 =?UTF-8?q?=E5=90=8E=E4=BF=AE=E6=94=B9=E8=BF=87=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-base/src/main/java/com/fr/env/RemoteEnvPane.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
index 37c4cd41a1..bc32385b7c 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -460,7 +460,9 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e.getMessage() , e);
                 }
-                textField.setText(name);
+                if (StringUtils.isEmpty(textField.getText())) {
+                    textField.setText(name);
+                }
             }
         }.execute();
     }