Merge pull request #8099 in DESIGN/design from release/11.0 to feature/x

* commit '607cb44ec93ad7ab1fd3b9e3f83d1d9b85bd8da7':
  CHART-23035 仪表盘轴标签样式修改均不生效
  CHART-23035 仪表盘轴标签样式修改均不生效
  REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时，老预览下看不到该控件，新预览下可以看到 1、在修改布局的时候，同时修改参数面板的width

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -569,7 +569,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //标签
-    private void populateLabel(VanChartAxis axis) {
+    protected void populateLabel(VanChartAxis axis) {
         if (showLabel != null) {
             showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1);
         }
@@ -813,7 +813,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //标签
-    private void updateLabel(VanChartAxis axis) {
+    protected void updateLabel(VanChartAxis axis) {
         if (showLabel != null) {
             axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0);
         }

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java

@@ -186,25 +186,43 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
     public void populateBean(VanChartAxis axis) {
         VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
         labelTextAttrPane.populate(axis.getTextAttr());
+        super.populateBean(gaugeAxis);
+    }
+
+    @Override
+    protected void populateLabel(VanChartAxis axis) {
+        VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
+
+        if (showLabel != null) {
+            showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1);
+        }
         if (mainTickColor != null) {
             mainTickColor.setSelectObject(gaugeAxis.getMainTickColor());
         }
         if (secTickColor != null) {
             secTickColor.setSelectObject(gaugeAxis.getSecTickColor());
         }
-        super.populateBean(gaugeAxis);
     }
 
     public void updateBean(VanChartAxis axis) {
         VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
         TextAttr textAttr = axis.getTextAttr();
         labelTextAttrPane.update(textAttr);
+        super.updateBean(gaugeAxis);
+    }
+
+    @Override
+    protected void updateLabel(VanChartAxis axis) {
+        VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
+
+        if (showLabel != null) {
+            axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0);
+        }
         if (mainTickColor != null) {
             gaugeAxis.setMainTickColor(mainTickColor.getSelectObject());
         }
         if (secTickColor != null) {
             gaugeAxis.setSecTickColor(secTickColor.getSelectObject());
         }
-        super.updateBean(gaugeAxis);
     }
 }

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

@@ -270,4 +270,16 @@ public class XWParameterLayout extends XWAbsoluteLayout {
     public boolean isTopable() {
         return false;
     }
+
+    /**
+     * 修改form布局的宽度时，需要同时修改表单参数界面的布局的宽度。
+     * */
+    @Override
+    public void doLayout() {
+        layout();
+        if (data != null && data instanceof WParameterLayout) {
+            ((WParameterLayout) data).setDesignWidth(getWidth());
+        }
+    }
+
 }