Browse Source

Pull request #10709: REPORT-84407 设计面板-单元格元素,国际化显示

Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0

* commit '947e420b837868876e34d549adda6a87cd15f0a3':
  REPORT-84407 修改隐藏面板时组件的宽度、高度
  REPORT-84407 设计面板-单元格元素,国际化显示 【问题原因】UIlabel高度被默认增加3 【改动思路】UIlabel高度减少3 【review建议】无
newui
Leo.Qin-覃宇攀 2 years ago
parent
commit
27a3c575e8
  1. 9
      designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

9
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> { 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); 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; protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
/** /**
@ -285,10 +288,10 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
if (selectedOneCell) { if (selectedOneCell) {
columnRowTextField.setPreferredSize(null); columnRowTextField.setPreferredSize(null);
cellLabel.setPreferredSize(null); cellLabel.setPreferredSize(null);
multipleLabelTip.setPreferredSize(new Dimension()); multipleLabelTip.setPreferredSize(HIDDEN_LABEL_DIMENSION);
} else { } else {
columnRowTextField.setPreferredSize(new Dimension()); columnRowTextField.setPreferredSize(HIDDEN_LABEL_DIMENSION);
cellLabel.setPreferredSize(new Dimension()); cellLabel.setPreferredSize(HIDDEN_LABEL_DIMENSION);
multipleLabelTip.setPreferredSize(null); multipleLabelTip.setPreferredSize(null);
} }
} }

Loading…
Cancel
Save