Pull request #4846: REPORT-54716 决策报表中修改组件名为大写，提示重

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0

* commit 'f4e67a6b149c91406aa40ee8ba43a9228cd6a38c':
  REPORT-54716 决策报表中修改组件名为大写，提示重名
  REPORT-54716 决策报表中修改组件名为大写，提示重名

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,7 @@ 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 exist = designer.getTarget().isNameExist(toSetWidgetName, widget) && !ComparatorUtils.equals(toSetWidgetName, currentWidgetName);
             if (toSetWidgetName.isEmpty()) {
                 widgetNameField.setText(currentWidgetName);
                 return;