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 6a04cf358d..7bbc17a80d 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
@@ -59,7 +59,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")) {
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..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
@@ -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,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;
             }
         }
@@ -741,7 +741,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
     }
 
     @Override
-    public boolean checkIfBeyondValidArea(MouseEvent e){
+    public boolean checkIfBeyondValidArea(MouseEvent e) {
         return false;
     }