Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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");
             }
         }

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()) {

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,7 +41,9 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
+        if (!PlotFactory.largeDataModel(plot)) {
             classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+        }
         classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 
             @Override
@@ -75,6 +78,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
 
     /**
      * 返回图表class对象
+     *
      * @return class对象
      */
     public Class<? extends Plot> class4Correspond() {

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);

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 {

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();
     }
 

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();