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

designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java

@@ -166,10 +166,10 @@ public class UIModeControlContainer extends JLayeredPane {
             }
             // 拖动的距离，为正值表示往下拖动，为负值表示往上拖动
             int deltaY = e.getY();
+            toolPaneY += deltaY;
             if (toolPaneY < 0) {
                 toolPaneY = 0;
             }
-            toolPaneY += deltaY;
             onResize(toolPaneY);
             refreshContainer();
         }
@@ -244,7 +244,7 @@ public class UIModeControlContainer extends JLayeredPane {
     };
 
     protected void onModeChanged() {
-            //do nothing here
+        //do nothing here
     }
 
     /**
@@ -315,7 +315,7 @@ public class UIModeControlContainer extends JLayeredPane {
             addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
-                     // do nothing
+                    // do nothing
                 }
             });
         }
@@ -340,7 +340,7 @@ public class UIModeControlContainer extends JLayeredPane {
 
             @Override
             public void layoutContainer(Container parent) {
-                 // do nothing
+                // do nothing
             }
 
             @Override

designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java

@@ -21,7 +21,7 @@ public class VanChartMapAnchorMarkerPane extends BasicBeanPane<VanChartAttrMarke
     private UISpinner anchorSize;
 
     public VanChartMapAnchorMarkerPane() {
-        anchorSize = new UISpinnerWithPx(0, Double.MAX_VALUE, 0.5, 28);
+        anchorSize = new UISpinnerWithPx(0, Double.MAX_VALUE, 0.5, 22);
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height")), anchorSize}