Browse Source

Merge pull request #139 in DESIGN/design from ~LOY/design:release/10.0 to release/10.0

* commit '33eb56409f5a3c491ddef4999bd8a3270281ab27':
  REPORT-8879 修复Oracle数据库填报界面无法自动获取表字段问题
master
loy 6 years ago
parent
commit
da68ea9831
  1. 5
      designer-base/src/com/fr/design/data/datapane/ChoosePane.java

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

@ -489,10 +489,13 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
protected String getTableName() { protected String getTableName() {
String tableName = ""; String tableName = "";
Object obj = this.tableNameComboBox.getSelectedItem(); Object obj = this.tableNameComboBox.getSelectedItemObject();
if (obj == null) {
obj = this.tableNameComboBox.getSelectedItem();
if (obj == null) { if (obj == null) {
obj = this.tableNameComboBox.getEditor().getItem(); obj = this.tableNameComboBox.getEditor().getItem();
} }
}
if (obj instanceof TreePath) { if (obj instanceof TreePath) {
Object tp = ((ExpandMutableTreeNode) ((TreePath) obj).getLastPathComponent()).getUserObject(); Object tp = ((ExpandMutableTreeNode) ((TreePath) obj).getLastPathComponent()).getUserObject();
if (tp instanceof TableProcedure) { if (tp instanceof TableProcedure) {

Loading…
Cancel
Save