From 82fc86da68aee8876550f2b6e003e25f07beee9b Mon Sep 17 00:00:00 2001
From: loy <loy@finereport.com>
Date: Mon, 29 Jan 2018 16:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=B8=A6.=E5=BC=95=E8=B5=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/data/datapane/ChoosePane.java |  7 +++++--
 .../com/fr/design/gui/icombobox/FRTreeComboBox.java | 13 +++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/designer_base/src/com/fr/design/data/datapane/ChoosePane.java b/designer_base/src/com/fr/design/data/datapane/ChoosePane.java
index b6cfc25a7a..eaa04114da 100644
--- a/designer_base/src/com/fr/design/data/datapane/ChoosePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/ChoosePane.java
@@ -466,9 +466,12 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
 
     protected String getTableName() {
         String tableName = "";
-        Object obj = this.tableNameComboBox.getSelectedItem();
+        Object obj = this.tableNameComboBox.getSelectedItemObject();
         if (obj == null) {
-            obj = this.tableNameComboBox.getEditor().getItem();
+            obj = this.tableNameComboBox.getSelectedItem();
+            if (obj == null) {
+                obj = this.tableNameComboBox.getEditor().getItem();
+            }
         }
         if (obj instanceof TreePath) {
             Object tp = ((ExpandMutableTreeNode) ((TreePath) obj).getLastPathComponent()).getUserObject();
diff --git a/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java b/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java
index ed8ffb16c7..4e8dc22303 100644
--- a/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java
+++ b/designer_base/src/com/fr/design/gui/icombobox/FRTreeComboBox.java
@@ -57,6 +57,7 @@ public class FRTreeComboBox extends UIComboBox {
     // richer:下拉展示用的tree
     protected JTree tree;
     private boolean onlyLeafSelectable = true;
+    private Object selectedObject = null;
 
     public FRTreeComboBox() {
         this(new JTree());
@@ -162,6 +163,7 @@ public class FRTreeComboBox extends UIComboBox {
     }
 
     public void setSelectedItem(Object o) {
+        selectedObject = o;
         if (o instanceof String) {
             this.setSelectedItemString((String) o);
             return;
@@ -173,6 +175,10 @@ public class FRTreeComboBox extends UIComboBox {
             this.getModel().setSelectedItem(o);
         }
     }
+
+    public Object getSelectedItemObject() {
+        return selectedObject;
+    }
     
     private boolean validTreePath(String treePath){
     	return StringUtils.isNotEmpty(treePath) && treePath.charAt(0) == '[' && treePath.endsWith("]");
@@ -183,12 +189,7 @@ public class FRTreeComboBox extends UIComboBox {
         if (validTreePath(temp)) {
             temp = temp.substring(2, temp.length() - 1);
             String[] selectedtable = temp.split(",");
-            String table = selectedtable[selectedtable.length - 1].trim();
-            if (table.contains(".")) {
-                String[] temp2 = table.split("\\.");
-                table = temp2[temp2.length - 1].trim();
-            }
-            return table;
+            return selectedtable[selectedtable.length - 1].trim();
         }
         return "";
     }