From 77d4d34086dae1d5a3855bd914de07fef00b3003 Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 2 Mar 2021 14:37:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-48327=20=E6=96=B0=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=88=91=E7=9A=84=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E6=8F=92=E4=BB=B6=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5=20=E3=80=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=91=E6=AD=A4=E5=89=8Dupm=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E8=B5=B0Files.probeContentType()?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=83=BD=E5=A4=9F=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=89=E4=B8=AA?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E4=B8=BAJxbrowser=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=AF=B9png?= =?UTF-8?q?=E7=BB=93=E5=B0=BE=E7=9A=84=E5=9B=BE=E7=89=87=E8=BF=94=E5=9B=9E?= =?UTF-8?q?Content-type=E4=B8=BAimage/png=E6=97=B6=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E9=80=A0=E6=88=90=E5=9B=BE=E7=89=87=E6=8C=82=E6=8E=89=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=9C=A8?= =?UTF-8?q?=E5=88=A4=E6=96=ADpath=E6=98=AF=E4=B8=8D=E6=98=AF=E4=BB=A5png?= =?UTF-8?q?=E7=BB=93=E5=B0=BE=E7=9A=84=E6=9D=A1=E4=BB=B6=E4=B8=AD=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BAupm?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8B=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E7=9A=84=EF=BC=8C=E4=BE=9D=E6=97=A7=E8=B5=B0=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=EF=BC=8C=E8=B5=B0=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/design/ui/Assistant.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/ui/Assistant.java b/designer-base/src/main/java/com/fr/design/ui/Assistant.java index 7e94306728..1c4d7e14a3 100644 --- a/designer-base/src/main/java/com/fr/design/ui/Assistant.java +++ b/designer-base/src/main/java/com/fr/design/ui/Assistant.java @@ -48,7 +48,8 @@ public class Assistant { if (path.endsWith(".svg")) { return "image/svg+xml"; } - if (path.endsWith(".png")) { + // upm 文件夹中的图片如果返回 Content-type 为 image/png 时会显示异常 + if (path.endsWith(".png") && !path.contains("/upm")) { return "image/png"; } if (path.endsWith(".woff")) { From a264231f0ebe0c541e74dc9d07eff51acb0f4e95 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Wed, 3 Mar 2021 11:17:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-47886=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=85=88=E6=B7=BB=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=86=8D=E6=96=B0=E5=BB=BA=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20=E5=85=A8=E9=83=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E5=8F=82=E6=95=B0=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BC=9A=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/form/parameter/FormParaDesigner.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java index 8d13f3ab42..6b0b2dd310 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java @@ -474,7 +474,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP */ @Override public void updateUI() { - setUI(new FormDesignerUI(){ + setUI(new FormDesignerUI() { @Override protected Rectangle getFitPaintBounds(Component component, Component parent) { return new Rectangle(0, 0, parent.getSize().width, parent.getSize().height); @@ -694,7 +694,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP formSubmitButton.setWidgetName("Search"); formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query")); XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton); - if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION + if ((this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { currentIndex = ((int) Math.ceil((currentIndex + 1) / (double) NUM_IN_A_LINE)) * NUM_IN_A_LINE; } @@ -741,7 +741,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP } @Override - public boolean checkIfBeyondValidArea(MouseEvent e){ + public boolean checkIfBeyondValidArea(MouseEvent e) { return false; } From 66d6036ef79788a1025d569cbb27aa4b5591befb Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Wed, 3 Mar 2021 11:21:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-47886=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=85=88=E6=B7=BB=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=86=8D=E6=96=B0=E5=BB=BA=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20=E5=85=A8=E9=83=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E5=8F=82=E6=95=B0=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BC=9A=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/form/parameter/FormParaDesigner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java index 6b0b2dd310..0ac74e5b58 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java @@ -694,8 +694,8 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP formSubmitButton.setWidgetName("Search"); formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query")); XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton); - if ((this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION - + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { + if (this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION + + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE))) { currentIndex = ((int) Math.ceil((currentIndex + 1) / (double) NUM_IN_A_LINE)) * NUM_IN_A_LINE; } }