From 56140f7bad26f6019582e8e96abda4df27bf51b6 Mon Sep 17 00:00:00 2001 From: Hades Date: Mon, 18 Jan 2021 12:11:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-46993=20=E3=80=9010.0.13=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=9A=84=E7=AC=AC=E4=B8=80=E5=BC=A0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index a47a6095d..1b0c4a5ce 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -74,6 +74,7 @@ import com.fr.stable.StringUtils; import com.fr.stable.core.UUID; import com.fr.workspace.WorkContext; import com.fr.workspace.server.lock.TplOperator; +import sun.security.krb5.internal.crypto.Des; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -357,6 +358,8 @@ public abstract class JTemplate> removeCenterPane(); // 加入新的 addCenterPane(); + + refreshToolArea(); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } From c1f10eeaa39a991b18529ec61fd8b6df654c8594 Mon Sep 17 00:00:00 2001 From: Hades Date: Mon, 18 Jan 2021 12:13:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-46993=20fix=20=E6=97=A0=E7=94=A8impo?= =?UTF-8?q?rt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 1b0c4a5ce..2a1327920 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -74,7 +74,6 @@ import com.fr.stable.StringUtils; import com.fr.stable.core.UUID; import com.fr.workspace.WorkContext; import com.fr.workspace.server.lock.TplOperator; -import sun.security.krb5.internal.crypto.Des; import javax.swing.BorderFactory; import javax.swing.Icon; From 7862ac6653ea41bc4872f47efce7c08dc68c46c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 18 Jan 2021 14:33:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=09CHART-17941=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/designer/style/series/VanChartMapAnchorMarkerPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java index 745c3a79a..c7ddda38b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java @@ -10,6 +10,7 @@ import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.van.chart.designer.TableLayout4VanChartHelper; +import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; @@ -35,6 +36,7 @@ public class VanChartMapAnchorMarkerPane extends BasicBeanPane