From 0cde4e25916f4902d989dd5692295bac5c538a29 Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Mon, 21 Nov 2016 15:20:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-841=20=E8=A1=A8=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=87=8D=E5=91=BD=E5=90=8D=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=9D=97=E5=86=85=E5=AE=B9=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/data/BasicTableDataTreePane.java    | 6 +++---
 .../com/fr/design/data/datapane/TableDataTreePane.java    | 8 +++++++-
 .../com/fr/design/mainframe/FormCreatorDropTarget.java    | 5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java b/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java
index a76d4a105..92f02d5f4 100644
--- a/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java
@@ -428,11 +428,11 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     }
 
     /**
-     * 合并数据集
+     * 合并数据集并返回自动更改数据集名字的新老名字键值对
      * @param srcName 数据集来源(比如报表块，就是报表块的名称)
      * @param tableDataSource 数据集
      */
-    public void addTableData(String srcName, TableDataSource tableDataSource) {
-
+    public Map<String, String> addTableData(String srcName, TableDataSource tableDataSource) {
+         return new HashMap<>(0);
     }
 }
diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
index 219093c6d..959abc98f 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
@@ -275,13 +275,15 @@ public class TableDataTreePane extends BasicTableDataTreePane {
      * @param srcName 数据集来源(比如报表块，就是报表块的名称)
      * @param tableDataSource 数据集
      */
-    public void addTableData(String srcName, TableDataSource tableDataSource) {
+    public Map<String, String> addTableData(String srcName, TableDataSource tableDataSource) {
+        Map<String,String> tdNameMap=new HashMap<>();
         allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
         DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
         TableDataSource tds = tc.getBook();
         Iterator tdIterator = tableDataSource.getTableDataNameIterator();
         while (tdIterator.hasNext()) {
             String tdName = (String) tdIterator.next();
+            String oldName = tdName;
             TableData td = tableDataSource.getTableData(tdName);
             if (tds.getTableData(tdName) != null || isDsNameRepeaded(tdName)) {//如果有同名的就拼上来源名称
                 tdName = srcName + tdName;
@@ -292,8 +294,12 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 tdName += i;
             }
             tds.putTableData(tdName, td);
+            if (!ComparatorUtils.equals(oldName, tdName)) {
+                tdNameMap.put(oldName, tdName);
+            }
         }
         tc.parameterChanged();
         dataTree.refresh();
+        return tdNameMap;
     }
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java
index 7e7035bb7..b4bfe270f 100644
--- a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java
+++ b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java
@@ -26,6 +26,7 @@ import java.awt.dnd.DropTarget;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
 import java.awt.dnd.DropTargetEvent;
+import java.util.Map;
 
 /**
  * 添加模式下鼠标事件处理器。
@@ -88,7 +89,9 @@ public class FormCreatorDropTarget extends DropTarget {
                 SharableElementCaseEditor sharableEditor = ShareLoader.getLoader().getSharedElCaseEditorById(shareId);
                 ElCaseBindInfo bindInfo = ShareLoader.getLoader().getElCaseBindInfoById(shareId);
                 if (sharableEditor != null && bindInfo != null) {
-                    TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(),sharableEditor.getTableDataSource());
+                    Map<String, String> tdNameMap = TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(), sharableEditor.getTableDataSource());
+                    //合并数据集之后,可能会有数据集名称变化，做一下联动
+                    sharableEditor.batchRenameTdName(tdNameMap);
                 }
             }
             Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData();