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

* commit '16ce75d0be3ff11bdeff20b961a0e00931b57437':
  CHART-20674 分类轴切换不影响网格线
  REPORT-58991 设计器内-模板画布可滚动-点击组件编辑-不在视线内的组件，编辑锁定位置有问题
  REPORT-59237 继续优化判断绘制间距线的地方代码

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

@@ -1,9 +1,10 @@
 package com.fr.van.chart.designer.style.axis;
 
+import com.fr.chart.base.ColorWithThemeStyle;
 import com.fr.chart.chartattr.Axis;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
@@ -16,9 +17,9 @@ import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.List;
+import java.awt.BorderLayout;
 
 /**
  * 带有坐标轴类型选择控件。可选类型：分类、时间、数值
@@ -98,11 +99,13 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
 
     public VanChartAxis update(VanChartAxis axis) {
         int index = axisTypePane.getSelectedIndex();
+        ColorWithThemeStyle mainGridColorWithPreStyle = axis.getMainGridColorWithPreStyle();
         if(ComparatorUtils.equals(index, AxisType.AXIS_CATEGORY.ordinal())){
             if(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_CATEGORY)){
                 textAxisPane.updateBean(axis);
             } else {
                 axis = new VanChartAxis(axis.getAxisName(), axis.getPosition(), axis.getGridLineType(), axis.getMainGridColor());
+                axis.setMainGridColorWithPreStyle(mainGridColorWithPreStyle);
                 textAxisPane.updateBean(axis);
             }
         } else if(ComparatorUtils.equals(index, AxisType.AXIS_TIME.ordinal())){
@@ -110,6 +113,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
                 timeAxisPane.updateBean(axis);
             } else {
                 axis = new VanChartTimeAxis(axis.getAxisName(), axis.getPosition(), axis.getGridLineType(), axis.getMainGridColor());
+                axis.setMainGridColorWithPreStyle(mainGridColorWithPreStyle);
                 timeAxisPane.updateBean(axis);
             }
         } else if(ComparatorUtils.equals(index, AxisType.AXIS_VALUE.ordinal())){
@@ -117,6 +121,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
                 valueAxisPane.updateBean(axis);
             } else {
                 axis = new VanChartValueAxis(axis.getAxisName(), axis.getPosition(), axis.getGridLineType(), axis.getMainGridColor());
+                axis.setMainGridColorWithPreStyle(mainGridColorWithPreStyle);
                 valueAxisPane.updateBean(axis);
             }
         }

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

@@ -797,7 +797,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		int formDesignerWidth = designer.getWidth();
 		int formDesignerHeight = designer.getHeight();
 		// 不超过可绘制区域
-		int extraX = Math.min(creatorRightX, formDesignerWidth);
+		int extraX = creatorRightX < 0 ? 0 : Math.min(creatorRightX, formDesignerWidth);
 		int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);
 
 		if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {

designer-form/src/main/java/com/fr/design/mainframe/FormSpacingLineDrawer.java

@@ -137,43 +137,22 @@ public class FormSpacingLineDrawer {
         GraphDrawHelper.drawString(g2d, text, labelX, labelY);
     }
 
-    private boolean isSelectedParaComponent() {
-        return designer.getParaComponent() == selectedCreator;
-    }
-
-    private boolean isSelectedRootComponent() {
-        return designer.isRoot(selectedCreator);
-    }
-
-    private boolean isSelectedForm() {
-        return selectedCreator.getParent() == null;
-    }
-
     private boolean isNeedExtendedLine(AbstractFormParallelLine[] nearestSides) {
         return nearestSides[0].isVerticalCenterLineBeforeTheParallelLine(nearestSides[1]) || nearestSides[0].isVerticalCenterLineBehindTheParallelLine(nearestSides[1]);
     }
 
-    private boolean isSelectedRootPane() {
-        // form、body、para这三个选中了，都不要画任何间距线
-        return isSelectedForm() || isSelectedRootComponent() || isSelectedParaComponent();
-    }
-
     // 当前组件是否在参数面板里面
-    private boolean isCompInBody(XCreator creator) {
+    private boolean isComponentInBody(XCreator creator) {
         XLayoutContainer container = XCreatorUtils.getHotspotContainer(creator);
         return container != null && !container.acceptType(XWParameterLayout.class);
     }
 
-    private boolean isSelectedCompInBody() {
+    private boolean isSelectedComponentInBody() {
-        return isCompInBody(selectedCreator);
+        return isComponentInBody(selectedCreator);
-    }
-
-    private boolean isHoveredCompInBody() {
-        return isCompInBody(hoverCreator);
     }
 
-    private boolean isCompInBody() {
+    private boolean isHoveredComponentInBody() {
-        return isSelectedCompInBody() && isHoveredCompInBody();
+        return isComponentInBody(hoverCreator);
     }
 
     private boolean isBodyAbsoluteLayout() {
@@ -185,7 +164,7 @@ public class FormSpacingLineDrawer {
     }
 
     private boolean isDrawSpacingLine() {
-        return isInAbsoluteLayout() && !isSelectedRootPane() && isCompInBody();
+        return isInAbsoluteLayout() && isSelectedComponentInBody() && isHoveredComponentInBody();
     }
 
     private AbstractFormParallelLine[] getNearestHorizontalSide() {