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

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

@@ -315,7 +315,7 @@ public class GridUI extends ComponentUI {
         }
 
         protected void iterateStart2End(Graphics2D g2d) {
-            float tmpSize = 0, paperSumSize = 0, sumSize = 0;
+            double tmpSize = 0, paperSumSize = 0, sumSize = 0;
             for (int i = 0; i <= endIndex; i++) {
                 // denny: 开始
                 if (i == 0) {
@@ -323,7 +323,7 @@ public class GridUI extends ComponentUI {
 
                     // denny: 增加从0到Grid左边被hide的列宽
                     for (int k = 0; k < startIndex; k++) {
-                        tmpSize = sizeList.get(k).toPixF(resolution);
+                        tmpSize = sizeList.get(k).toPixD(resolution);
 
                         paperSumSize += tmpSize;
                         if (paperSumSize >= paperPaintSize) {
@@ -333,7 +333,7 @@ public class GridUI extends ComponentUI {
                 }
 
                 // adjust height.
-                tmpSize = sizeList.get(i).toPixF(resolution);
+                tmpSize = sizeList.get(i).toPixD(resolution);
                 paperSumSize += tmpSize;
 
                 if (showGridLine) {// paint line.
@@ -342,7 +342,7 @@ public class GridUI extends ComponentUI {
                 }
 
                 // paint paper margin line.
-                if (showPaginateLine && paperSumSize >= paperPaintSize) {
+                if (showPaginateLine && (float)paperSumSize > (float) paperPaintSize) {
                     paginateLineList.add(getPaginateLine2D((int) sumSize));
                     paperSumSize = tmpSize;
                 }
@@ -497,8 +497,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 +625,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);
                     }
                 }