Browse Source

Merge pull request #1 in ~HADES/design from ~JOE.JIANG/design:release/10.0 to release/10.0

* commit '4e003bcf44608f309ed4b39efd6b78db05908637':
  REPORT-20492 单元格属性设置形态-数据字典,数据库连接失败的弹框中图标显示错误
feature/big-screen
Hades 5 years ago
parent
commit
2f1ac5abdd
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

2
designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@ -461,7 +461,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
if (!connect) {
DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.INFORMATION_MESSAGE);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
failedToFindTable();
return null;
}

Loading…
Cancel
Save