From 28a7a50aa14970ac5292113499d653729eab2ba4 Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Mon, 14 Nov 2016 17:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=8B=96=E6=8B=BD=E8=BF=87=E7=A8=8B=E4=B8=AD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E7=9A=84=E5=90=88=E5=B9=B6=E5=8E=BB=E9=87=8D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=80=83=E8=99=91=E5=88=B0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/data/BasicTableDataTreePane.java | 18 ++++++++++--------
 .../data/datapane/TableDataTreePane.java       |  3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java b/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java
index 45cd0cea7..a76d4a105 100644
--- a/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java
@@ -118,7 +118,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         if (StringUtils.isBlank(tempName)) {
             nPanel.setShowText(Inter.getLocText(new String[]{"DS-TableData", "ISEMPTY", "PLEASE", "GIVE-NAME"}, new String[]{"", "，", "", "！"}));
             dg.setButtonEnabled(false);
-        } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName, allDSNames)) {
+        } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) {
             String[] waring = new String[]{"DS-TableData", "Utils-has_been_existed", "PLEASE", "Rename"};
             String[] sign = new String[]{tempName, "，", "", "！"};
             nPanel.setShowText(Inter.getLocText(waring, sign));
@@ -324,20 +324,22 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     private String createDsName(String prefix) {
         int count = 1;
         allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
-        while (isDsNameRepeaded(prefix + count, allDSNames)) {
+        while (isDsNameRepeaded(prefix + count)) {
             count++;
         }
         return prefix + count;
     }
 
-    private boolean isDsNameRepeaded(String name, String[] names) {
-        boolean repeat = false;
-        for (int i = 0; i < names.length; i++) {
-            if (ComparatorUtils.equals(name, names[i])) {
-                repeat = true;
+    protected boolean isDsNameRepeaded(String name) {
+        if (allDSNames == null) {
+            allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
+        }
+        for (int i = 0; i < allDSNames.length; i++) {
+            if (ComparatorUtils.equals(name, allDSNames[i])) {
+                return true;
             }
         }
-        return repeat;
+        return false;
     }
 
     protected KeyAdapter getTableTreeNodeListener(final UpdateAction editAction, final UpdateAction previewTableDataAction, final UpdateAction removeAction, final TableDataSourceOP op, final TableDataTree dataTree) {
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 2e605cafc..219093c6d 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
@@ -276,13 +276,14 @@ public class TableDataTreePane extends BasicTableDataTreePane {
      * @param tableDataSource 数据集
      */
     public void addTableData(String srcName, TableDataSource tableDataSource) {
+        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();
             TableData td = tableDataSource.getTableData(tdName);
-            if (tds.getTableData(tdName) != null) {//如果有同名的就拼上来源名称
+            if (tds.getTableData(tdName) != null || isDsNameRepeaded(tdName)) {//如果有同名的就拼上来源名称
                 tdName = srcName + tdName;
             }
             int i = 0;