From 2a416ce6ade9a2ac0f9230a2ee62717f150a8fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Thu, 17 Sep 2020 10:11:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?CHART-15730=20=E7=94=98=E7=89=B9=E5=9B=BE?= =?UTF-8?q?=E7=9A=84=E5=A4=A7=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=87=8C=E7=A8=8B=E7=A2=91=E4=B8=BA=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gantt/designer/style/series/VanChartGanttSeriesPane.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java index c89dff039..9236773e7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java @@ -59,10 +59,6 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { return ganntStylePane; } - protected void checkCompsEnabledWithLarge(Plot plot) { - - } - private JPanel createLinkLinePane(){ lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); colorSelect = new ColorSelectBoxWithOutTransparent(100); From 4e93f6d235d8f02d265252b47b8164329c311d56 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 17 Sep 2020 11:34:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-39911=20=E6=B5=B7=E5=A4=96=E7=89=88?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8F=B3=E4=BE=A7=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=A0=8F=E9=BB=98=E8=AE=A4=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=81=E4=B8=8D=E5=8F=AF=E6=8B=96=E6=8B=BD=20REPORT-39340=20?= =?UTF-8?q?=E3=80=90=E5=9B=9E=E5=BD=92=E3=80=91=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E9=97=AA=E9=80=80=E6=8F=90=E7=A4=BA=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/dialog/ErrorDialog.java | 2 +- .../gui/icontainer/UIEastResizableContainer.java | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java b/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java index 21042a57a..11a49fafe 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java @@ -35,7 +35,7 @@ public abstract class ErrorDialog extends JDialog implements ActionListener { JPanel messagePane = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); UILabel boldFontLabel = new UILabel(message); UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Send_Report_To_Us")); - Font font = FRFont.getInstance("Dialog", Font.BOLD, 20); + Font font = FRFont.getInstance(label.getFont().getFontName(), Font.BOLD, 20); boldFontLabel.setFont(font); messagePane.add(boldFontLabel); messagePane.add(label); diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java index df07acf1a..77407a3ed 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -19,7 +19,7 @@ import java.awt.event.MouseMotionListener; public class UIEastResizableContainer extends JPanel { private static final long serialVersionUID = 1854340560790476907L; - public static final int MAX_CONTAINER_WIDTH = 500; + public static final int MAX_CONTAINER_WIDTH = 340; public static final int MIN_CONTAINER_WIDTH = 286; private int containerWidth = 240; @@ -266,13 +266,7 @@ public class UIEastResizableContainer extends JPanel { @Override public void mouseDragged(MouseEvent e) { - containerWidth = UIEastResizableContainer.this.getWidth() + (UIEastResizableContainer.this.getLocationOnScreen().x - e.getXOnScreen()); - containerWidth = Math.min(containerWidth, MAX_CONTAINER_WIDTH); - containerWidth = Math.max(containerWidth, MIN_CONTAINER_WIDTH); - refreshContainer(); - if ( DesignModeContext.isAuthorityEditing()) { - DesignerContext.getDesignerFrame().doResize(); - } + // do noting } }); addMouseListener(new MouseAdapter() { From 67c043b47684c99913739eb78dfae4efdb5fde96 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 17 Sep 2020 20:02:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-38917=20=E6=A8=A1=E6=9D=BF=E7=9F=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=85=E7=9A=84=E4=BF=9D=E5=AD=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=B9=E5=BA=94=E5=A4=9A=E4=B8=AAUUID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/fr/design/DesignerEnvManagerTest.java | 8 ++++++++ .../com/fr/design/data/DesignTableDataManagerTest.java | 3 +++ 2 files changed, 11 insertions(+) diff --git a/designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java b/designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java index b7d123d66..f60d6da29 100644 --- a/designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java +++ b/designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java @@ -3,6 +3,7 @@ package com.fr.design; import junit.framework.TestCase; import java.util.Locale; +import org.junit.Assert; public class DesignerEnvManagerTest extends TestCase{ @@ -17,4 +18,11 @@ public class DesignerEnvManagerTest extends TestCase{ assertEquals("下边界", envManager.getLanguage(), Locale.SIMPLIFIED_CHINESE); } + + public void testGetUUID() { + DesignerEnvManager envManager = new DesignerEnvManager(); + String uuid0 = envManager.getUUID(); + String uuid1 = envManager.getUUID(); + Assert.assertEquals(uuid0, uuid1); + } } diff --git a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java index 9a5ce7b8c..0e32f7e2d 100644 --- a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java +++ b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java @@ -155,4 +155,7 @@ public class DesignTableDataManagerTest { DesignTableDataManager.addDsColumnNames("ds1", new String[]{"a", "b", "c"}); Assert.assertEquals(columnNames, DesignTableDataManager.getDsColumnNames("ds1")); } + + public void testFireDsChanged() { + } } From 0c681257d3833dd97980153c77d1a1ef84962b2d Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 17 Sep 2020 20:04:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-38917=20=E6=A8=A1=E6=9D=BF=E7=9F=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=85=E7=9A=84=E4=BF=9D=E5=AD=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=B9=E5=BA=94=E5=A4=9A=E4=B8=AAUUID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 5 ++++- .../java/com/fr/design/data/DesignTableDataManagerTest.java | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index da2f0e0dc..6f1c94eee 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -1472,7 +1472,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } public String getUUID() { - return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid; + if (StringUtils.isEmpty(uuid)) { + uuid = UUID.randomUUID().toString(); + } + return uuid; } public int getActiveKeyStatus() { diff --git a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java index 0e32f7e2d..9a5ce7b8c 100644 --- a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java +++ b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java @@ -155,7 +155,4 @@ public class DesignTableDataManagerTest { DesignTableDataManager.addDsColumnNames("ds1", new String[]{"a", "b", "c"}); Assert.assertEquals(columnNames, DesignTableDataManager.getDsColumnNames("ds1")); } - - public void testFireDsChanged() { - } } From e538d9918422b2b8474114a21ead338e2b995843 Mon Sep 17 00:00:00 2001 From: Yvan Date: Thu, 17 Sep 2020 20:07:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-38571=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91mac=E4=B8=8B=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=8F=98=E6=A8=A1=E7=B3=8A=201.=20bug=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=EF=BC=9A=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=9C=A8=E9=AB=98=E6=B8=85=E5=B1=8F=E4=B8=8B=E8=A2=AB=E6=94=BE?= =?UTF-8?q?=E5=A4=A7=E4=BA=86=EF=BC=8C=E6=89=80=E4=BB=A5=E6=98=BE=E5=BE=97?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=202.=20=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B0=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=89=93=E5=BC=80=E5=92=8C=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E7=9A=84=E5=9B=BE=E7=89=87=E7=94=B1=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=8416*16=E6=9B=BF=E6=8D=A2=E4=B8=BA32*32=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=B8=80=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E7=BC=A9=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/server/ServerTray.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/start/server/ServerTray.java b/designer-base/src/main/java/com/fr/start/server/ServerTray.java index 2b3713c0f..4ad6e15b4 100644 --- a/designer-base/src/main/java/com/fr/start/server/ServerTray.java +++ b/designer-base/src/main/java/com/fr/start/server/ServerTray.java @@ -29,9 +29,9 @@ public class ServerTray { private MenuItem stopMenu; - private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted.png"); + private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted@2x.png"); - private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped.png"); + private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped@2x.png"); private ServerManageFrame serverManageFrame; @@ -188,4 +188,4 @@ public class ServerTray { } }); } -} \ No newline at end of file +}