From 2f846bdcabc2230d93740d49029ea1b0204975e5 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Thu, 11 Apr 2024 17:58:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?REPORT-115482=20fix:=20=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E6=8A=A5=E8=A1=A8=E5=9D=97=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=8F=92=E5=85=A5=E5=9B=BE=E7=89=87=EF=BC=8C?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../style/background/image/ImagePreviewPane.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java index bc4f3f41cc..f24fed4ba0 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java @@ -9,6 +9,7 @@ import com.fr.base.Style; import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.general.ImageWithSuffix; +import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreGraphHelper; import javax.swing.JComponent; @@ -92,9 +93,14 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre isLoading = false; CoreGraphHelper.waitForImage(image); - imageWidth = image.getWidth(null); - imageHeight = image.getHeight(null); - + if (image.getFineImage() != null && image.getImage() != null) { + try { + imageWidth = image.getWidth(null); + imageHeight = image.getHeight(null); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + } this.setToolTipText("Image Size: " + imageWidth + "x" + imageHeight + "px"); } fireChangeListener(); From 8662a36b5c80ff7ad10c4d819d6ca1455b235504 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 17 Apr 2024 13:49:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/fr/design/EnvChangeEntranceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java index cab7037cd2..dd7617d95c 100644 --- a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java +++ b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java @@ -49,7 +49,7 @@ public class EnvChangeEntranceTest { EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null); FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class); - EasyMock.expect(request.getServiceList()).andReturn(null); + EasyMock.expect(request.getServiceList(connectionInfo)).andReturn(null); PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes(); EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch); From a5e76c7efd8449d7c56a934c1bbe16d37aef7a06 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 18 Apr 2024 14:49:18 +0800 Subject: [PATCH 3/7] =?UTF-8?q?INO-19848=20fix:=E8=8B=B1=E6=96=87=E7=9A=84?= =?UTF-8?q?=E7=BF=BB=E8=AD=AF=E6=9C=83=E4=BB=A4=E5=AE=A2=E6=88=B6=E8=AA=A4?= =?UTF-8?q?=E6=9C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ui/designer/ComboBoxDefinePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java index 900072b7c0..583346868b 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java @@ -27,7 +27,7 @@ public class ComboBoxDefinePane extends DictEditorDefinePane { public Component[] createWaterMarkPane() { waterMarkField = new UITextField(); - return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkField}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_PlaceHolder")), waterMarkField}; } protected void populateSubDictionaryEditorBean(ComboBox ob){ From 5853dfb155501fbbdffea0c02658297777386595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Tue, 23 Apr 2024 19:43:51 +0800 Subject: [PATCH 4/7] =?UTF-8?q?REPORT-118629=20FRM=E5=B9=B6=E8=A1=8C?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=81=B6=E5=8F=91=E5=9F=8B=E7=82=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/record/analyzer/advice/MonitorAdvice.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java b/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java index a4ddfcd4e8..e2c94a8f10 100644 --- a/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java +++ b/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java @@ -88,8 +88,9 @@ public class MonitorAdvice implements DesignerAnalyzerAdvice { MessageRecorderFactory.getInstance().syncSubmit(message); } } - } catch (Exception ignore) { + } catch (Exception ex) { //埋点信息入库失败应该不能影响业务流程 + FineLoggerFactory.getLogger().debug("[Metric] failed to log message.", ex); } finally { sessionBinder.detachSession(); } @@ -113,7 +114,11 @@ public class MonitorAdvice implements DesignerAnalyzerAdvice { } public static void recordSQLDetail(String uuid) { - DBMeterFactory.getMeter().submit(uuid); + try { + DBMeterFactory.getMeter().submit(uuid); + } catch (Exception e) { + FineLoggerFactory.getLogger().debug("[Metric] failed to log sql detail.", e); + } } public static void recordSQL(Compute once, MeasureObject measureObject) { From 434180a8f5e3ff7967dffac1782cbbb15556a13b Mon Sep 17 00:00:00 2001 From: roger Date: Mon, 6 May 2024 18:15:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?REPORT-118163=20=E8=8E=B7=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E4=BA=86=E6=95=B0=E6=8D=AE=E9=9B=86sql=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E4=B8=AD=E6=B3=A8=E9=87=8A=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/preview/sql/PreviewPerformedSqlPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java index c4996d539e..97d043abde 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java @@ -251,7 +251,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener { private static Parameter[] processParameters(DBTableData tableData, Calculator calculator) { ParameterProvider[] parameters = tableData.getParameters(); if (parameters == null || parameters.length == 0) { - tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQuery(), false)); + tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQueryWithoutSqlNote(), false)); return new Parameter[0]; } return Parameter.providers2Parameter(Calculator.processParameters(calculator, parameters)); From e6cd8b6876cc70499cd336407b4ebaa40b30fda5 Mon Sep 17 00:00:00 2001 From: roger Date: Wed, 8 May 2024 11:06:57 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/preview/sql/PreviewPerformedSqlPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java index 97d043abde..fdf9249763 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java @@ -251,7 +251,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener { private static Parameter[] processParameters(DBTableData tableData, Calculator calculator) { ParameterProvider[] parameters = tableData.getParameters(); if (parameters == null || parameters.length == 0) { - tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQueryWithoutSqlNote(), false)); + tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQueryWithoutAnnotation(), false)); return new Parameter[0]; } return Parameter.providers2Parameter(Calculator.processParameters(calculator, parameters)); From 123de4010e6508a03b4eb647ef3b7ddc72d5ef55 Mon Sep 17 00:00:00 2001 From: roger Date: Wed, 8 May 2024 11:29:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/preview/sql/PreviewPerformedSqlPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java index fdf9249763..c827a17ebe 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java @@ -251,7 +251,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener { private static Parameter[] processParameters(DBTableData tableData, Calculator calculator) { ParameterProvider[] parameters = tableData.getParameters(); if (parameters == null || parameters.length == 0) { - tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQueryWithoutAnnotation(), false)); + tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQueryWithoutComments(), false)); return new Parameter[0]; } return Parameter.providers2Parameter(Calculator.processParameters(calculator, parameters));