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

designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarConditionPane.java

@@ -53,7 +53,7 @@ public class VanChartRadarConditionPane extends DataSeriesConditionPane{
         } else {
             classPaneMap.put(VanChartAttrMarker.class, new VanChartMarkerConditionPane(this));
             classPaneMap.put(VanChartAttrLine.class, new VanChartLineWidthConditionPane(this));
-            classPaneMap.put(AttrAreaSeriesFillColorBackground.class, new VanChartAreaFillColorConditionPane(this));
+            classPaneMap.put(AttrAreaSeriesFillColorBackground.class, new VanChartAreaFillColorConditionPane(this, plot));
             classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getRadarPlotDefaultEffect()));
         }
     }

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

@@ -363,7 +363,7 @@ public class EditingMouseListener extends MouseInputAdapter {
             designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         } // component.getParent() 是报表块所在的XWTitleLayout
         int minX = button.getX() + getParentPositionX(component, 0) - designer.getHorizontalScaleValue();
-        int minY = button.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue();
+        int minY = button.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue() + xElementCase.getY();
         if (e.getX() + GAP - xElementCase.getInsets().left > minX && e.getX() - GAP - xElementCase.getInsets().left < minX + button.getWidth()) {
             if (e.getY() + GAP - xElementCase.getInsets().top > minY && e.getY() - GAP - xElementCase.getInsets().top < minY + button.getHeight()) {
                 designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
@@ -462,7 +462,7 @@ public class EditingMouseListener extends MouseInputAdapter {
                 designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
             }
             int minX = button.getX() + getParentPositionX(component, 0) - designer.getHorizontalScaleValue();
-            int minY = button.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue();
+            int minY = button.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue() + xChartEditor.getY();
             if (e.getX() + GAP > minX && e.getX() - GAP < minX + button.getWidth()) {
                 if (e.getY() + GAP > minY && e.getY() - GAP < minY + button.getHeight()) {
                     designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));

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

@@ -72,6 +72,5 @@ public class TopXCreators extends JComponent {
             TopXCreator topXCreator = (TopXCreator) getComponent(i);
             topXCreator.resizeTopXCreator();
         }
-        repaint();
     }
 }