From 4b2f2d51d8e60ea395c21472fecee26e21c0dae0 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 8 Jun 2021 10:18:28 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-53398=20=E3=80=90=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E3=80=91=E7=BB=84=E4=BB=B6=E6=8B=96=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8Ctab2=E5=86=85=E5=BC=95=E7=94=A8=E5=88=B0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=8D=E7=9A=84=E5=9C=B0=E6=96=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=90=8D=E7=A7=B0=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/designer/beans/models/ModelUtil.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/ModelUtil.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/ModelUtil.java
index 10e672f58..0f75896e1 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/models/ModelUtil.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/ModelUtil.java
@@ -32,6 +32,8 @@ abstract class ModelUtil {
         //直接遍历出来目标值，然后按需处理
         xCreator.traversalNameRelatedXCreators(nameRelatedCreators);
         Map<String, String> renameMap = new HashMap<>();
+        // 避免与旧名称重复
+        initDuplicated(nameRelatedCreators, duplicated);
         for (XCreator target : nameRelatedCreators) {
             String uniqueName = uniqueName(form, target, duplicated);
             String oldName = target.toData().getWidgetName();
@@ -42,6 +44,12 @@ abstract class ModelUtil {
         }
         EventDispatcher.fire(WidgetNameModifyEvent.INSTANCE, new ContentChangeItem(renameMap, xCreator.toData(), ChangeItem.WIDGET_NAME));
     }
+
+    private static void initDuplicated(Set<XCreator> nameRelatedCreators, Set<String> duplicated) {
+        for (XCreator xCreator : nameRelatedCreators) {
+            duplicated.add(xCreator.toData().getWidgetName());
+        }
+    }
     
     private static String uniqueName(Form form, XCreator xCreator, Set<String> duplicated) {