Merge pull request #274 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0

* commit '7f9ad664f093b393680e33888e7953a46aabed2e':
  REPORT-10084 设计器表单水印超过画布，到了设计面板了

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

@@ -109,8 +109,6 @@ public class FormDesignerUI extends ComponentUI {
             // 当前正在添加的组件
             paintAddingBean(g, addingModel);
         }
-
-        paintWatermark((Graphics2D) g);
     }
 
     // 绘制水印
@@ -400,6 +398,7 @@ public class FormDesignerUI extends ComponentUI {
 //        g.drawImage(img,-designer.getArea().getHorizontalValue(),-designer.getArea().getVerticalValue() + designer.getParaHeight(), (int) (parent.getSize().width*time + designer.getArea().getHorizontalValue()), (int) (parent.getSize().height*time + designer.getArea().getVerticalValue()),null);
 
         designer.paintContent(clipg);
+        paintWatermark((Graphics2D) clipg);
         clipg.dispose();
 
         // 恢复双缓冲