Merge remote-tracking branch 'origin/release/11.0' into release/11.0

designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

@@ -58,6 +58,9 @@ import java.util.Set;
 public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     protected static final Dimension LABEL_DIMENSION = new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element")), 20);
+
+    // 使用UILabel.getPreferredSize时，若文本为html高度被默认增加3
+    protected static final Dimension HIDDEN_LABEL_DIMENSION = new Dimension(0, -3);
     protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
 
     /**
@@ -285,10 +288,10 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         if (selectedOneCell) {
             columnRowTextField.setPreferredSize(null);
             cellLabel.setPreferredSize(null);
-            multipleLabelTip.setPreferredSize(new Dimension());
+            multipleLabelTip.setPreferredSize(HIDDEN_LABEL_DIMENSION);
         } else {
-            columnRowTextField.setPreferredSize(new Dimension());
+            columnRowTextField.setPreferredSize(HIDDEN_LABEL_DIMENSION);
-            cellLabel.setPreferredSize(new Dimension());
+            cellLabel.setPreferredSize(HIDDEN_LABEL_DIMENSION);
             multipleLabelTip.setPreferredSize(null);
         }
     }