Pull request #1773: REPORT-33944 页边距为0，设计器虚线和实际有1的误差

Merge in DESIGN/design from ~HENRY.WANG/design:bugfix/10.0 to bugfix/10.0

* commit 'c1d29e61697a5997eaadeb53751620158efe06be':
  REPORT-33944 改为常量
  REPORT-33944 大于允许的精度之外才是大于
  REPORT-33944 页边距为0，设计器虚线和实际有1的误差

designer-realize/src/main/java/com/fr/grid/GridUI.java

@@ -300,6 +300,8 @@ public class GridUI extends ComponentUI {
 
         private int resolution;
 
+        private static  final double THRESHOLD = 1.0E-4D;
+
         DrawLineHelper(int startIndex, int endIndex, boolean showGridLine,
                        boolean showPaginateLine, DynamicUnitList sizeList, double paperPaintSize,
                        List paginateLineList, int resolution) {
@@ -342,7 +344,7 @@ public class GridUI extends ComponentUI {
                 }
 
                 // paint paper margin line.
-                if (showPaginateLine && paperSumSize >= paperPaintSize) {
+                if (showPaginateLine && paperSumSize - paperPaintSize > THRESHOLD) {
                     paginateLineList.add(getPaginateLine2D((int) sumSize));
                     paperSumSize = tmpSize;
                 }
@@ -497,8 +499,8 @@ public class GridUI extends ComponentUI {
             paintCellElementRectangleList.add(this.tmpRectangle.clone());
 
 
-            double cellWidth =  this.tmpRectangle.getWidth();
-            double cellHeight =  this.tmpRectangle.getHeight();
+            double cellWidth = this.tmpRectangle.getWidth();
+            double cellHeight = this.tmpRectangle.getHeight();
             // denny_Grid: 画Grid中单元格的内容(包括单元格的背景Content + Background), 不包括边框
 
             painter.paintBackground(g2d, report, tmpCellElement, cellWidth - 1, cellHeight - 1);
@@ -625,10 +627,10 @@ public class GridUI extends ComponentUI {
                 tmpLine2D = (Line2D) paginateLineList.get(j);// 直接强制转换，因为List中肯定都是Line2D型的
                 for (int k = j + 1; k < paginateLineList.size(); k++) {
                     tmpLine2D2 = (Line2D) paginateLineList.get(k);
-                    if (AssistUtils.equals(tmpLine2D2.getX1() ,tmpLine2D.getX1())
-                            && AssistUtils.equals(tmpLine2D2.getX2() , tmpLine2D.getX2())
-                            && AssistUtils.equals(tmpLine2D2.getY1() , tmpLine2D.getY1())
-                            && AssistUtils.equals(tmpLine2D2.getY2() , tmpLine2D.getY2())) {
+                    if (AssistUtils.equals(tmpLine2D2.getX1(), tmpLine2D.getX1())
+                            && AssistUtils.equals(tmpLine2D2.getX2(), tmpLine2D.getX2())
+                            && AssistUtils.equals(tmpLine2D2.getY1(), tmpLine2D.getY1())
+                            && AssistUtils.equals(tmpLine2D2.getY2(), tmpLine2D.getY2())) {
                         paginateLineList.remove(k);
                     }
                 }