Browse Source

Merge pull request #9194 in DESIGN/design from final/11.0 to release/11.0

* commit '1421d0419a0141fe25b3d651969e3d1ae9ebab8b':
  REPORT-73256 文本超出后隐藏设置会影响单元格基本属性设置
  REPORT-73256 文本超出后隐藏设置会影响单元格基本属性设置
  REPORT-71957 组件复用-创建组件,确认后提示共享组件创建失败,且日志有报错
release/11.0
superman 2 years ago
parent
commit
fefcdd7939
  1. 10
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

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

@ -79,6 +79,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
//文本超出时隐藏
private UICheckBox textOverflowCheckBox;
private int curSelectedIndex;
private UIComboBox showPartComboBox;
private CardLayout showPartLayout;
private JPanel showPartPane;
@ -325,7 +326,16 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
showPartLayout.show(showPartPane, "none");
showPartPane.setPreferredSize(new Dimension(0, 0));
}
// 记录目前自动调整哪个被选中
for (int i = 0; i < adjustRadioButtons.length; i++) {
if (adjustRadioButtons[i].isSelected()) {
curSelectedIndex = i;
break;
}
}
noAutoRadioButton.setSelected(true);
} else {
adjustRadioButtons[curSelectedIndex].setSelected(true);
}
}
});

2
designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

@ -660,7 +660,7 @@ public class ShareMainPane extends JPanel {
Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
return false;
}
if (FileCommonUtils.isFileNameValid(name)) {
if (!FileCommonUtils.isFileNameValid(name)) {
FineJOptionPane.showMessageDialog(
shareDialog,
Toolkit.i18nText("Fine-Design_Share_Generate_Failure_Illegal_Component_Name_Tip"),

Loading…
Cancel
Save