From f2e7401bda33cb554f70899d4acd72ee5b7050d9 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 5 Jul 2021 14:17:03 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-54716=20=E5=86=B3=E7=AD=96=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E5=86=99=EF=BC=8C=E6=8F=90=E7=A4=BA=E9=87=8D?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/widget/ui/FormWidgetCardPane.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 4ab3fdb74..debc5ae87 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -86,7 +86,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             return null;
         } else if (xLayoutContainer.acceptType(XWAbsoluteLayout.class)) {
             return new WidgetAbsoluteBoundPane(xCreator);
-        } else if(xCreator.acceptType(XWCardTagLayout.class)){
+        } else if (xCreator.acceptType(XWCardTagLayout.class)) {
             return new WidgetCardTagBoundPane(xCreator);
         }
         return new WidgetBoundPane(xCreator);
@@ -231,7 +231,14 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             UITextField widgetNameField = widgetPropertyPane.getWidgetNameField();
             String toSetWidgetName = widgetNameField.getText();
             String currentWidgetName = widget.getWidgetName();
-            boolean exist = designer.getTarget().isNameExist(toSetWidgetName) && !ComparatorUtils.equals(toSetWidgetName, currentWidgetName);
+            boolean isNameExist = false;
+            Widget tempWidget = designer.getTarget().getWidgetByName(toSetWidgetName);
+            if (!ComparatorUtils.equals(widget, tempWidget)) {
+                isNameExist = true;
+            } else if (ComparatorUtils.equals(toSetWidgetName, tempWidget.getWidgetName())) {
+                isNameExist = true;
+            }
+            boolean exist = isNameExist && !ComparatorUtils.equals(toSetWidgetName, currentWidgetName);
             if (toSetWidgetName.isEmpty()) {
                 widgetNameField.setText(currentWidgetName);
                 return;