Browse Source

Merge pull request #272 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit '73eab99c2c2fb514e588dd27925a010e5c3c29f9':
  REPORT-9133 填报属性面板
  CORE-116 代码规范
research/10.0
richie 6 years ago
parent
commit
8b92b3f712
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
  2. 5
      designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java

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

@ -103,7 +103,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
} }
private boolean isIncludeUnderline(String name) { private boolean isIncludeUnderline(String name) {
return ComparatorUtils.equals(name.indexOf(StoreProcedureAssist.GROUP_MARKER), -1) ? false : true; return name.contains(StoreProcedureAssist.GROUP_MARKER);
} }
/** /**

5
designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java

@ -23,7 +23,10 @@ public abstract class ObjectJControlPane extends JListControlPane {
@Override @Override
protected BasicBeanPane createPaneByCreators(NameableCreator creator) { protected BasicBeanPane createPaneByCreators(NameableCreator creator) {
try {
return Reflect.on(creator.getUpdatePane()).create(object).get(); return Reflect.on(creator.getUpdatePane()).create(object).get();
} catch (Exception e) {
return super.createPaneByCreators(creator);
}
} }
} }
Loading…
Cancel
Save