diff --git a/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java b/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java
index 5881132b3..f3e8c4ebd 100644
--- a/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java
+++ b/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java
@@ -146,6 +146,7 @@ public class DesignModuleFactory {
             try {
                 return (ParameterDesignerProvider) instance.formParaDesigner.newInstance();
             } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 FineLoggerFactory.getLogger().error("error in form para designer");
             }
         }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
index 49ed07023..885931cb9 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
@@ -29,6 +29,7 @@ import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
+import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
@@ -436,6 +437,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             conditionAttr.remove(AttrEffect.class);
             conditionAttr.remove(AttrLineEffect.class);
             conditionAttr.remove(AttrFloatColor.class);
+            conditionAttr.remove(AttrGanttLabel.class);
 
             VanChartAttrMarker attrMarker = conditionAttr.getExisted(VanChartAttrMarker.class);
             if (attrMarker != null && !attrMarker.isCommon()) {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java
index 42428c631..24a5d45fe 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java
@@ -12,6 +12,7 @@ import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltip;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
 import com.fr.plugin.chart.type.ConditionKeyType;
+import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
@@ -40,16 +41,18 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
-        classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
-        classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot){
+        if (!PlotFactory.largeDataModel(plot)) {
+            classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+        }
+        classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 
             @Override
             protected VanChartPlotTooltipPane createTooltipContentsPane() {
-                return new VanChartPlotTooltipNoCheckPane(getPlot(), null){
+                return new VanChartPlotTooltipNoCheckPane(getPlot(), null) {
                     @Override
                     protected AttrTooltip getAttrTooltip() {
                         AttrGanttTooltip attrGanttTooltip = new AttrGanttTooltip();
-                        ((AttrGanttTooltipContent)attrGanttTooltip.getContent()).getDurationFormat().setEnable(true);
+                        ((AttrGanttTooltipContent) attrGanttTooltip.getContent()).getDurationFormat().setEnable(true);
                         return attrGanttTooltip;
                     }
                 };
@@ -65,7 +68,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
 
     @Override
     protected ChartConditionPane createListConditionPane() {
-        return new ChartConditionPane(){
+        return new ChartConditionPane() {
             @Override
             protected ConditionKeyType[] conditionKeyTypes() {
                 return ConditionKeyType.Gantt_CONDITION_KEY_TYPES;
@@ -75,6 +78,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
 
     /**
      * 返回图表class对象
+     *
      * @return class对象
      */
     public Class<? extends Plot> class4Correspond() {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
index c17d97692..c89dff039 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
@@ -44,7 +44,8 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         Component[][] components = new Component[][]{
                 new Component[]{createGanntStylePane()},
                 new Component[]{createLinkLinePane()},
-                new Component[]{createMarkerPane()}
+                new Component[]{createMarkerPane()},
+                new Component[]{createLargeDataModelPane()}
         };
 
         contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col);
@@ -58,6 +59,10 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         return ganntStylePane;
     }
 
+    protected void checkCompsEnabledWithLarge(Plot plot) {
+
+    }
+
     private JPanel createLinkLinePane(){
         lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         colorSelect = new ColorSelectBoxWithOutTransparent(100);
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
index 7c852f282..b98c2a952 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
@@ -433,7 +433,11 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     @Override
     public XLayoutContainer getTopLayout() {
-        XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
+        XLayoutContainer parentXLayoutContainer = XCreatorUtils.getParentXLayoutContainer(this);
+        if (parentXLayoutContainer == null) {
+            return this;
+        }
+        XLayoutContainer xTopLayout = parentXLayoutContainer.getTopLayout();
         if (xTopLayout != null && !xTopLayout.isEditable()) {
             return xTopLayout;
         } else {
diff --git a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
index 85ec9474d..46377b1ad 100644
--- a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
+++ b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
@@ -17,6 +17,9 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isAppRelayout(FormDesigner designer) {
+        if (!designer.getRootComponent().acceptType(WFitLayout.class)) {
+            return false;
+        }
         return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();
     }
 
diff --git a/designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java b/designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java
index e62a5772c..af41fd088 100644
--- a/designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java
+++ b/designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java
@@ -95,7 +95,8 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
         setComponentBg(this);
         paraDesignEditor = DesignModuleFactory.getFormParaDesigner();
         if (paraDesignEditor == null) {
-            return;
+            // 为空时 设置默认值
+            paraDesignEditor = new FormParaDesigner();
         }
         paraDesignEditor.initWidgetToolbarPane();