From 72df91768ac6199100f0781988a1ef621acc7570 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 18 Aug 2022 10:30:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-73183=20=20=E4=BC=98=E5=8C=96tab?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99=EF=BC=8C=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E8=A7=84=E5=88=99=E6=98=AF=EF=BC=8Ctabxy=EF=BC=8Cx?=
 =?UTF-8?q?=E4=B8=BAtablayout=E4=B8=ADtab=E7=9A=84index=EF=BC=8Cy=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=ADtablayout=20=E7=9A=84index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creator/cardlayout/XWCardTagLayout.java        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
index dbffab21a2..cbfe296555 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
@@ -35,6 +35,7 @@ import com.fr.general.act.BorderPacker;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 import com.fr.general.cardtag.DefaultTemplateStyle;
+import com.fr.stable.StringUtils;
 
 import javax.swing.border.Border;
 import java.awt.*;
@@ -133,13 +134,15 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
 
         int index = this.cardLayout.toData().getWidgetCount();
         //新加一个card
-        String widgetName = tagName + getTabNameIndex();
+        String widgetName = tagName + getTabNameIndex() + getCardLayoutSuffix(cardLayout.toData().getWidgetName(), cardLayout.createDefaultName());
         WTabFitLayout fitLayout = new WTabFitLayout(widgetName, tabFitIndex, currentCard);
         fitLayout.setTabNameIndex(getTabNameIndex());
         XWTabFitLayout tabFitLayout = new XWTabFitLayout(fitLayout, new Dimension());
 
         FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-        ModelUtil.renameWidgetName(formDesigner.getTarget(), tabFitLayout);
+        if (formDesigner.getTarget().isNameExist(widgetName)) {
+            ModelUtil.renameWidgetName(formDesigner.getTarget(), tabFitLayout);
+        }
         WCardTagLayout layout = (WCardTagLayout) this.toData();
 
         if(!ComparatorUtils.equals(layout.getTemplateStyle().getStyle(), DefaultTemplateStyle.DEFAULT_TEMPLATE_STYLE)){
@@ -154,6 +157,13 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         cardLayout.showCard();
     }
 
+    private String getCardLayoutSuffix(String cardLayoutName, String defaultName){
+        if (StringUtils.isEmpty(cardLayoutName) || StringUtils.isEmpty(defaultName) || !cardLayoutName.contains(defaultName)){
+            return StringUtils.EMPTY;
+        }
+        return cardLayoutName.substring(defaultName.length());
+    }
+
 
     @Override
     protected String getIconName() {