diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
index 683b38e01..8f26ec8c3 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
@@ -8,6 +8,7 @@ import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ipasswordfield.UIPassWordField;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.ilable.ActionLabel;
diff --git a/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java b/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java
index c1cb98ca3..6fdace66a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java
@@ -77,7 +77,7 @@ public class UIPasswordFieldWithFixedLength extends UIPassWordField {
                 if (clearPassword) {
                     UIPasswordFieldWithFixedLength.this.setText(StringUtils.EMPTY);
                     UIPasswordFieldWithFixedLength.this.clearPassword = false;
-                    UIPasswordFieldWithFixedLength.this.updateUI();
+                    //UIPasswordFieldWithFixedLength.this.updateUI();
                 }
             }
         });
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index fe0276b38..92d06d0b5 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -746,10 +746,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     public void checkCombineUp(boolean flag, ArrayList<String> al) {
         //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
-        if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) {
-            return;
+        JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jTemplate != null) {
+            if (jTemplate.getMenuState() != DesignState.WORK_SHEET) {
+                combineUp.checkComponentsByNames(flag, al);
+            }
         }
-        combineUp.checkComponentsByNames(flag, al);
     }
 
     /**
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java b/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java
index 89b261bb9..eef16f80b 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java
@@ -78,5 +78,6 @@ public class TopXCreators extends JComponent {
             TopXCreator topXCreator = (TopXCreator) getComponent(i);
             topXCreator.resizeTopXCreator();
         }
+        //repaint();
     }
 }