diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/AbstractCellElementAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/AbstractCellElementAction.java
index 0b2e702de3..450c326915 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/AbstractCellElementAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/AbstractCellElementAction.java
@@ -68,7 +68,7 @@ public abstract class AbstractCellElementAction extends CellSelectionAction {
                             if (isNeedShinkToFit()) {
                                 // shink to fit.(如果value是String)
                                 Object editElementValue = editCellElement.getValue();
-                                if (editElementValue != null && (editElementValue instanceof String || editElementValue instanceof Number)) {
+                                if (checkValueType(editElementValue)) {
                                     // TODO ALEX_SEP 暂时用FIT_DEFAULT替代,不取reportsetting里面的设置,因为也不知道是应该放在report里面还是elementcase里面
                                     GridUtils.shrinkToFit(ReportConstants.AUTO_SHRINK_TO_FIT_DEFAULT, tplEC, editCellElement);
                                 }
@@ -78,6 +78,10 @@ public abstract class AbstractCellElementAction extends CellSelectionAction {
                 }
                 ePane.fireTargetModified();
             }
+
+            private boolean checkValueType(Object editElementValue) {
+                return editElementValue instanceof String || editElementValue instanceof Number;
+            }
         });
         //控件设置记住dlg，提交入库智能添加单元格后可以show出来
         DesignerContext.setReportWritePane(dialog);
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java
index dde927a168..107b06e5e9 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java
@@ -82,7 +82,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
      */
     protected UITextField columnRowTextField;
     protected TemplateCellElement cellElement;
-    protected TextFormatPane formatPane;
+    private TextFormatPane formatPane;
     private final JPanel topContentContainer;
     private final JComponent centerBodyContainer;
 
@@ -437,6 +437,10 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         return columnRowTextField;
     }
 
+    /**
+     * 创建格式化面板
+     * @return
+     */
     private JPanel createFormatPane() {
         formatPane = new TextFormatPane();
         AbstractAttrNoScrollPane container = new AbstractAttrNoScrollPane() {