Merge pull request #8999 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit 'a8a5de63f687cef441e934c644e4957dc1071c27':

designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentSender.java

@@ -17,13 +17,7 @@ public class ComponentSender {
     private static final String CLOUD_REUSE_URL = "https://cloud.fanruan.com/api/monitor/record_of_reusePlugin/single";
     
     public static boolean send() {
-    
-        long start = System.currentTimeMillis();
-    
         String content = ComponentCollector.getInstance().generateTotalInfo();
-    
-        long end = System.currentTimeMillis();
-        FineLoggerFactory.getLogger().error("cal time cost {} ms", end - start);
         return sendInfo(CLOUD_REUSE_URL, content);
     }
     

designer-form/src/main/java/com/fr/design/designer/beans/models/ModelUtil.java

@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * created by Harrison on 2020/06/05
  **/
-abstract class ModelUtil {
+public abstract class ModelUtil {
     
     public static void renameWidgetName(Form form, XCreator xCreator) {
         

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java

@@ -9,6 +9,7 @@ import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRWCardTagLayoutAdapter;
+import com.fr.design.designer.beans.models.ModelUtil;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
@@ -137,6 +138,8 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         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);
         WCardTagLayout layout = (WCardTagLayout) this.toData();
 
         if(!ComparatorUtils.equals(layout.getTemplateStyle().getStyle(), DefaultTemplateStyle.DEFAULT_TEMPLATE_STYLE)){