Browse Source

Pull request #7700: REPORT-66196 【优化大文本】新建一个设置,显示部分设置字符长度5,点击保存后,查看有问题

Merge in DESIGN/design from ~BRUCE.DENG/design:feature/x to feature/x

* commit '5501f1b41099d2529d3a792683ead253e9a252b7':
  REPORT-66196 【优化大文本】新建一个设置,显示部分设置字符长度5,点击保存后,查看有问题
feature/x
Bruce.Deng 3 years ago
parent
commit
7d74dd5ab7
  1. 14
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

14
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@ -318,16 +318,14 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
public void itemStateChanged(ItemEvent e) { public void itemStateChanged(ItemEvent e) {
textOverflowComPane.setVisible(e.getStateChange() == ItemEvent.SELECTED); textOverflowComPane.setVisible(e.getStateChange() == ItemEvent.SELECTED);
if (e.getStateChange() == ItemEvent.SELECTED) { if (e.getStateChange() == ItemEvent.SELECTED) {
noAutoRadioButton.setSelected(true);
textOverflowComPane.setVisible(true);
if (showPartComboBox.getSelectedIndex() == 0) { if (showPartComboBox.getSelectedIndex() == 0) {
showPartPane.setPreferredSize(new Dimension(70, 20));
showPartLayout.show(showPartPane, "content"); showPartLayout.show(showPartPane, "content");
} else { } else {
showPartLayout.show(showPartPane, "none"); showPartLayout.show(showPartPane, "none");
showPartPane.setPreferredSize(new Dimension(0, 0)); showPartPane.setPreferredSize(new Dimension(0, 0));
} }
} else { noAutoRadioButton.setSelected(true);
textOverflowComPane.setVisible(false);
} }
} }
}); });
@ -543,11 +541,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
if (cellGUIAttr.isHideTextWhenOverflow()) { if (cellGUIAttr.isHideTextWhenOverflow()) {
textOverflowCheckBox.setSelected(true); textOverflowCheckBox.setSelected(true);
if (cellGUIAttr.isShowCharNum()) { if (cellGUIAttr.isShowCharNum()) {
showPartLayout.show(showPartPane, "content"); showPartComboBox.setSelectedIndex(0);
showCharNums.setValue(cellGUIAttr.getShowCharNums()); showCharNums.setValue(cellGUIAttr.getShowCharNums());
} else { } else {
showPartLayout.show(showPartPane, "none"); showPartComboBox.setSelectedIndex(1);
showPartPane.setPreferredSize(new Dimension(0, 0));
} }
showPartPane.setVisible(true); showPartPane.setVisible(true);
if (cellGUIAttr.isTextOverflowEllipsis()) { if (cellGUIAttr.isTextOverflowEllipsis()) {
@ -556,6 +553,9 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
textOverflowTypeComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol")); textOverflowTypeComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol"));
} }
} else { } else {
showPartComboBox.setSelectedIndex(0);
showCharNums.setValue(cellGUIAttr.getShowCharNums());
textOverflowTypeComboBox.setSelectedIndex(0);
textOverflowCheckBox.setSelected(false); textOverflowCheckBox.setSelected(false);
} }
CellPageAttr cellPageAttr = cellElement.getCellPageAttr(); // 分页 CellPageAttr cellPageAttr = cellElement.getCellPageAttr(); // 分页

Loading…
Cancel
Save