From dceeb24569152f68c5618735292f4b41c48043ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Fri, 3 Dec 2021 18:26:56 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-63092=20=E7=BB=84=E4=BB=B6=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8-=E6=8B=96=E5=85=A5=E5=B8=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E7=9A=84=E5=A4=8D=E7=94=A8=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=BE=E8=AE=A1=E7=94=BB=E5=B8=83=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E5=90=8E=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E6=B2=A1=E6=9C=89=E8=A2=AB=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/constants/TableDataConstants.java   | 5 +++++
 .../main/java/com/fr/design/data/BasicTableDataUtils.java  | 7 +++----
 .../src/main/java/com/fr/design/mainframe/JForm.java       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 designer-base/src/main/java/com/fr/design/constants/TableDataConstants.java

diff --git a/designer-base/src/main/java/com/fr/design/constants/TableDataConstants.java b/designer-base/src/main/java/com/fr/design/constants/TableDataConstants.java
new file mode 100644
index 0000000000..7d8c66c093
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/constants/TableDataConstants.java
@@ -0,0 +1,5 @@
+package com.fr.design.constants;
+
+public class TableDataConstants {
+    public static final String SEPARATOR = "_";
+}
diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java
index c711a1999d..ae90c5bacc 100644
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java
@@ -1,6 +1,7 @@
 package com.fr.design.data;
 
 import com.fr.data.TableDataSource;
+import com.fr.design.constants.TableDataConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.stable.StringUtils;
@@ -11,8 +12,6 @@ import com.fr.stable.StringUtils;
  * Created by hades on 2020/4/27
  */
 public abstract class BasicTableDataUtils {
-    private static final String SEPARATOR = "_";
-
     private static final int LEN = 2;
 
 
@@ -38,10 +37,10 @@ public abstract class BasicTableDataUtils {
 
     public static String getTableDataName(boolean isCover, TableDataSource tds, String tdName, String srcName, boolean isDsNameRepeaded) {
         if (isCover) {
-            return srcName + SEPARATOR + tdName;
+            return srcName + TableDataConstants.SEPARATOR + tdName;
         }
         if (tds.getTableData(tdName) != null || isDsNameRepeaded) {//如果有同名的就拼上来源名称
-            tdName = srcName + SEPARATOR + tdName;
+            tdName = srcName + TableDataConstants.SEPARATOR  + tdName;
         }
         int i = 0;
         while (tds.getTableData(tdName) != null) {
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index 6d7bf83ae9..d8680e4ad1 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -1085,7 +1085,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
             }
             Iterator tdIterator = sharableEditor.getTableDataSource().getTableDataNameIterator();
             while (tdIterator.hasNext()) {
-                String tdName = bindInfo.getName() + "-" + tdIterator.next();
+                String tdName = bindInfo.getName() + TableDataConstants.SEPARATOR  + tdIterator.next();
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).removeTableData(tdName);
             }
         }