diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
index bdaf40d22..2f4a69937 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
@@ -20,6 +20,7 @@ import com.fr.form.FormProvider;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -127,7 +128,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     private CRPropertyDescriptor getReportFitEditor() {
         this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         FitProvider wbTpl = designer.getTarget();
-        ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
+        //这边获取到的全局要考虑到服务器的配置
+        ReportFitAttr fitAttr = wbTpl.getReportFitAttr() == null ? ReportFitConfig.getInstance().getFrmFitAttr() : wbTpl.getReportFitAttr();
         ElementCaseEditor editor = this.toData();
         //兼容之前报表块（之前三个选项为：默认 横向 双向 现在是：横向 双向 不自适应)
         if (editor.getFitStateInPC() == 0) {
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 850378af2..ec070ad86 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
@@ -8,6 +8,7 @@ import com.fr.base.ScreenResolution;
 import com.fr.design.designer.beans.AdapterBus;
 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;
@@ -136,6 +137,9 @@ 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)){
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 205ad01ff..e53649ee1 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -71,6 +71,7 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
                 280, 20,
                 createLayoutPane()
         );
+        layoutExpandablePane.setBorder(BorderFactory.createEmptyBorder(0,0,10,0));
         this.add(layoutExpandablePane, BorderLayout.NORTH);
 
         JPanel advancePane = createAdvancePane();